summaryrefslogtreecommitdiffstats
path: root/src/desktop.cpp
diff options
context:
space:
mode:
authorSebastian Wüst <sebi@timewaster.de>2013-10-28 17:23:42 +0000
committerSebastian Wüst <sebi@timewaster.de>2013-10-28 17:23:42 +0000
commitc6ad2a34d38795059888d3c900dbf1047bfd5fdd (patch)
tree88de58a63003bd2ea6edda9c895d3c0466a38e6b /src/desktop.cpp
parenttext change (diff)
parentFix for bug #1156394 (OCAL dialog: Close button in German localization contai... (diff)
downloadinkscape-c6ad2a34d38795059888d3c900dbf1047bfd5fdd.tar.gz
inkscape-c6ad2a34d38795059888d3c900dbf1047bfd5fdd.zip
mrege from trunk
(bzr r12417.1.31)
Diffstat (limited to 'src/desktop.cpp')
-rw-r--r--src/desktop.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp
index f5c35514c..ec446e0f0 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -681,7 +681,6 @@ void SPDesktop::set_event_context2(const std::string& toolName) {
SPEventContext* ec_new = ToolFactory::instance().createObject(toolName);
ec_new->desktop = this;
ec_new->message_context = new Inkscape::MessageContext(this->messageStack());
- ec_new->setup();
event_context = ec_new;
@@ -690,6 +689,8 @@ void SPDesktop::set_event_context2(const std::string& toolName) {
delete ec_old;
}
+ ec_new->setup();
+
sp_event_context_activate(event_context);
_event_context_changed_signal.emit(this, event_context);