Hand-apply 33b76b675d747fd828aba91d9d857227cb8a8244 from master; make sure signals are disconnected in the right places.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index c0f1feb66..3fab6864a 100644
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 class ServerFinder : public ExceptionStore
 {
 public:
-	void connect (boost::function<void (ServerDescription)>);
+	boost::signals2::connection connect (boost::function<void (ServerDescription)>);
 
 	static ServerFinder* instance ();
 	static void drop ();
@@ -32,6 +32,10 @@ public:
 		_disabled = true;
 	}
 
+	bool disabled () const {
+		return _disabled;
+	}
+
 private:
 	ServerFinder ();
 	~ServerFinder ();