summaryrefslogtreecommitdiffstats
path: root/src/desktop.cpp
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2008-01-17 20:50:00 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2008-01-17 20:50:00 +0000
commit15b8b0b9397cd9eceeb18c87d7ee9616d84179ca (patch)
tree47aaea3400b76765034fa577a3b051c7740936c4 /src/desktop.cpp
parentsorry for this late feature change. this makes the curvestitching *that* much... (diff)
downloadinkscape-15b8b0b9397cd9eceeb18c87d7ee9616d84179ca.tar.gz
inkscape-15b8b0b9397cd9eceeb18c87d7ee9616d84179ca.zip
remove SPDesktop from SPNamedView when it is destroyed. Fixing bug 183621, but another bug is apparently present that causes a bug with similar trigger
(bzr r4540)
Diffstat (limited to 'src/desktop.cpp')
-rw-r--r--src/desktop.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp
index e52d2b50c..9498d5399 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -314,6 +314,8 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas)
void SPDesktop::destroy()
{
+ namedview->hide(this);
+
_activate_connection.disconnect();
_deactivate_connection.disconnect();
_sel_modified_connection.disconnect();
@@ -1086,9 +1088,11 @@ SPDesktop::shutdown()
bool SPDesktop::onDeleteUI (GdkEventAny*)
{
- if(shutdown()) return true;
- destroyWidget();
- return false;
+ if(shutdown())
+ return true;
+
+ destroyWidget();
+ return false;
}
/**