summaryrefslogtreecommitdiffstats
path: root/src/desktop.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-10-30 01:29:41 +0000
committerJabiertxof <jtx@jtx.marker.es>2013-10-30 01:29:41 +0000
commit69fdb9c26ab5c065e3e892a77982413f34dac7fe (patch)
tree4d6052268d7a9a0d6eedc159256a0bcffe69ff78 /src/desktop.cpp
parentUpdate to trunk (diff)
parentsuppress uninitialized variables (x and y) warning, don't ask why... g++'s wa... (diff)
downloadinkscape-69fdb9c26ab5c065e3e892a77982413f34dac7fe.tar.gz
inkscape-69fdb9c26ab5c065e3e892a77982413f34dac7fe.zip
Update to trunk
(bzr r11950.1.191)
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);