2 files changed, 7 insertions, 0 deletions
diff --git a/src/server/Broadcaster.cpp b/src/server/Broadcaster.cpp
index ab6b16fb..6c111a1c 100644
--- a/src/server/Broadcaster.cpp
+++ b/src/server/Broadcaster.cpp
@@ -26,6 +26,12 @@
 namespace Ingen {
 namespace Server {
 
+Broadcaster::~Broadcaster()
+{
+	Glib::Mutex::Lock lock(_clients_mutex);
+	_clients.clear();
+}
+
 /** Register a client to receive messages over the notification band.
  */
 void
diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp
index 621b6b61..34bfa728 100644
--- a/src/server/Broadcaster.hpp
+++ b/src/server/Broadcaster.hpp
@@ -43,6 +43,7 @@ class Broadcaster : public Interface
 {
 public:
 	Broadcaster() : _bundle_depth(0) {}
+	~Broadcaster();
 
 	void register_client(const Raul::URI& uri, SharedPtr<Interface> client);
 	bool unregister_client(const Raul::URI& uri);