2 files changed, 6 insertions, 0 deletions
diff --git a/src/xml/helper-observer.cpp b/src/xml/helper-observer.cpp
index e56ddc6f8..957f3df0a 100644
--- a/src/xml/helper-observer.cpp
+++ b/src/xml/helper-observer.cpp
@@ -8,6 +8,11 @@ SignalObserver::SignalObserver()
     : _oldsel(NULL)
 {}
 
+SignalObserver::~SignalObserver()
+{
+    set(NULL); // if _oldsel!=nullptr, remove observer and decrease refcount
+}
+
 // Add this observer to the SPObject and remove it from any previous object
 void SignalObserver::set(SPObject* o)
 {
diff --git a/src/xml/helper-observer.h b/src/xml/helper-observer.h
index e7881cd4d..2f70ba792 100644
--- a/src/xml/helper-observer.h
+++ b/src/xml/helper-observer.h
@@ -17,6 +17,7 @@ namespace Inkscape {
 		{
 		public:
 			SignalObserver();
+			~SignalObserver();
 
 			// Add this observer to the SPObject and remove it from any previous object
 			void set(SPObject* o);