diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-08-23 13:04:31 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-08-23 13:04:31 +0000 |
| commit | 3c8060ba7e44eea05cb24db78a71e27e3742da03 (patch) | |
| tree | 146a2731a32de057a16be2a684b4015cbdc8f397 /src/file.cpp | |
| parent | fix Windows 64-bit build (diff) | |
| parent | Fix skewing bug that could lead to infinite transforms (diff) | |
| download | inkscape-3c8060ba7e44eea05cb24db78a71e27e3742da03.tar.gz inkscape-3c8060ba7e44eea05cb24db78a71e27e3742da03.zip | |
update to trunk lp:inkscape 13530 (fixes Windows build)
(bzr r13341.1.155)
Diffstat (limited to 'src/file.cpp')
| -rw-r--r-- | src/file.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/file.cpp b/src/file.cpp index 2f13ae3b0..7181f4f98 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -148,14 +148,14 @@ SPDesktop *sp_file_new(const std::string &templ) DocumentUndo::setUndoSensitive(doc, true); } - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if (desktop) - desktop->setWaitingCursor(); + SPDesktop *olddesktop = SP_ACTIVE_DESKTOP; + if (olddesktop) + olddesktop->setWaitingCursor(); SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); // TODO this will trigger broken link warnings, etc. g_return_val_if_fail(dtw != NULL, NULL); sp_create_window(dtw, TRUE); - desktop = static_cast<SPDesktop *>(dtw->view); + SPDesktop* desktop = static_cast<SPDesktop *>(dtw->view); doc->doUnref(); @@ -166,6 +166,8 @@ SPDesktop *sp_file_new(const std::string &templ) Inkscape::Extension::Dbus::dbus_init_desktop_interface(desktop); #endif + if (olddesktop) + olddesktop->clearWaitingCursor(); if (desktop) desktop->clearWaitingCursor(); |