projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
[dcpomatic.git]
/
src
/
lib
/
server_finder.cc
diff --git
a/src/lib/server_finder.cc
b/src/lib/server_finder.cc
index 72a9a4ef5d9f166d3945959849cb73fa3f0fc20b..726437ea57b3eaa14fdea90667c38a053f5963cb 100644
(file)
--- a/
src/lib/server_finder.cc
+++ b/
src/lib/server_finder.cc
@@
-22,7
+22,6
@@
#include "util.h"
#include "config.h"
#include "cross.h"
#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>
#include "dcpomatic_socket.h"
#include "raw_convert.h"
#include <libcxml/cxml.h>
@@
-167,7
+166,7
@@
ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> so
xml->read_string (s);
string const ip = socket->socket().remote_endpoint().address().to_string ();
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);
ServerDescription sd (ip, xml->number_child<int> ("Threads"));
{
boost::mutex::scoped_lock lm (_mutex);