Fix crash due to lack of signal disconnection.

diff --git a/src/lib/log.cc b/src/lib/log.cc
index 52dff2982222620d81a9b7426c13c2a32beb523e..4de6bd874e94c4c97feed165a210de7b10169936 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -39,7 +39,7 @@ int const Log::TYPE_TIMING  = 0x8;
 Log::Log ()
        : _types (0)
 {
-       Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
+       _config_connection = Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
        config_changed ();
 }
 

diff --git a/src/lib/log.h b/src/lib/log.h
index 2ba273b44dd09e2e254c3a914ce16d2829959cee..94d30de4ecbb109a8b557bc145041c2517685899 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -27,6 +27,7 @@
 #include <string>
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
 
 /** @class Log
  *  @brief A very simple logging class.
@@ -47,16 +48,15 @@ public:
 
        void set_types (int types);
 
-protected:     
-       /** mutex to protect the log */
-       boost::mutex _mutex;
-       
 private:
        virtual void do_log (std::string m) = 0;
        void config_changed ();
        
+       /** mutex to protect the log */
+       boost::mutex _mutex;
        /** bit-field of log types which should be put into the log (others are ignored) */
        int _types;
+       boost::signals2::scoped_connection _config_connection;
 };
 
 class FileLog : public Log