From 1b0b9e4b951e305d47bb011fc4e198472bb3fecf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 16 Mar 2015 22:25:57 +0000 Subject: Hand-apply 33b76b675d747fd828aba91d9d857227cb8a8244 from master; make sure signals are disconnected in the right places. --- src/lib/encoder.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib/encoder.cc') diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 6b520571a..2a6026879 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -93,7 +93,9 @@ Encoder::begin () _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional ()))); } - ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1)); + if (!ServerFinder::instance()->disabled ()) { + _server_found_connection = ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1)); + } } void -- cgit v1.2.3