From: Carl Hetherington <cth@carlh.net>
Date: Wed, 20 May 2015 15:29:25 +0000 (+0100)
Subject: Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
X-Git-Tag: v2.0.48~89
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=6f0a590bc3266f21ba577116219bd019e891d480;hp=-c

Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
---

6f0a590bc3266f21ba577116219bd019e891d480
diff --combined src/lib/server_finder.cc
index f347132e4,b4b400b52..726437ea5
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@@ -22,7 -22,6 +22,6 @@@
  #include "util.h"
  #include "config.h"
  #include "cross.h"
- #include "ui_signaller.h"
  #include "dcpomatic_socket.h"
  #include "raw_convert.h"
  #include <libcxml/cxml.h>
@@@ -167,13 -166,13 +166,13 @@@ ServerFinder::handle_accept (boost::sys
  	xml->read_string (s);
  	
  	string const ip = socket->socket().remote_endpoint().address().to_string ();
 -	if (!server_found (ip)) {
 +	if (!server_found (ip) && xml->optional_number_child<int>("Version").get_value_or (0) == SERVER_LINK_VERSION) {
  		ServerDescription sd (ip, xml->number_child<int> ("Threads"));
  		{
  			boost::mutex::scoped_lock lm (_mutex);
  			_servers.push_back (sd);
  		}
- 		ui_signaller->emit (boost::bind (boost::ref (ServerFound), sd));
+ 		emit (boost::bind (boost::ref (ServerFound), sd));
  	}
  
  	start_accept ();