diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-25 11:17:41 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-25 11:17:41 +0000 |
| commit | f86f093b618fb7747b708cf293a2e62d4c9e834f (patch) | |
| tree | a521c84a52fb7222bdb37565027f9f26d51e4668 /src/desktop.cpp | |
| parent | update to trunk (diff) | |
| parent | Updating libdepixelize. (diff) | |
| download | inkscape-f86f093b618fb7747b708cf293a2e62d4c9e834f.tar.gz inkscape-f86f093b618fb7747b708cf293a2e62d4c9e834f.zip | |
update to trunk
(bzr r11950.1.313)
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); } |