diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-03-26 01:54:08 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-03-26 01:54:08 +0000 |
| commit | e80a86b84d1e5cd64139df6aee147795067cb938 (patch) | |
| tree | 53fb3e0050a406d48dd4c869997db4ff92832bc1 /src/desktop.cpp | |
| parent | Update to trunk (diff) | |
| parent | Patch for several issues in libuemf. (diff) | |
| download | inkscape-e80a86b84d1e5cd64139df6aee147795067cb938.tar.gz inkscape-e80a86b84d1e5cd64139df6aee147795067cb938.zip | |
Update to trunk
(bzr r13090.1.32)
Diffstat (limited to 'src/desktop.cpp')
| -rw-r--r-- | src/desktop.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index a02baeac8..22c00d4f1 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -663,8 +663,8 @@ SPDesktop::change_document (SPDocument *theDocument) SPDesktopWidget *dtw = (SPDesktopWidget *) parent->get_data("desktopwidget"); if (dtw) { dtw->desktop = this; + dtw->updateNamedview(); } - dtw->updateNamedview(); _namedview_modified (namedview, SP_OBJECT_MODIFIED_FLAG, this); _document_replaced_signal.emit (this, theDocument); @@ -1537,7 +1537,9 @@ SPDesktop::updateCanvasNow() void SPDesktop::setDocument (SPDocument *doc) { - if (this->doc() && doc) { + if (!doc) return; + + if (this->doc()) { namedview->hide(this); this->doc()->getRoot()->invoke_hide(dkey); } |