From: mental <mental@users.sourceforge.net>
Date: Wed, 16 Aug 2006 01:02:09 +0000 (+0000)
Subject: We were disconnecting the wrong signal, resulting on the old object's
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=54682196a3317979027b46f7b35204b800593d50;p=inkscape.git

We were disconnecting the wrong signal, resulting on the old object's
release signal lingering after a URIReference's referrent changed.  Fixed,
thereby fixing bug #1535218.
---

diff --git a/src/uri-references.cpp b/src/uri-references.cpp
index 793e10d98..6b2a8401f 100644
--- a/src/uri-references.cpp
+++ b/src/uri-references.cpp
@@ -97,13 +97,13 @@ void URIReference::_setObject(SPObject *obj) {
 	SPObject *old_obj=_obj;
 	_obj = obj;
 
+	_release_connection.disconnect();
 	if (_obj) {
 		sp_object_href(_obj, _owner);
 		_release_connection = _obj->connectRelease(sigc::mem_fun(*this, &URIReference::_release));
 	}
 	_changed_signal.emit(old_obj, _obj);
 	if (old_obj) {
-		_release_connection.disconnect();
 		/* release the old object _after_ the signal emission */
 		sp_object_hunref(old_obj, _owner);
 	}