Fix drag & drop from swatches - patch by Adonis Papaderos

diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
index 021479843a1a4ff9de526345c2a139b5b6c80931..9b00dcd036eaa13ed3ba3b1a7d4b22bc3ad217f1 100644 (file)
--- a/src/eraser-context.cpp
+++ b/src/eraser-context.cpp
@@ -576,10 +576,13 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
                 dc->repr = NULL;
             }
 
-            Inkscape::Rubberband::get(desktop)->stop();
             dc->_message_context->clear();
             ret = TRUE;
         }
+        if (Inkscape::Rubberband::get(desktop)->is_started()) {
+            Inkscape::Rubberband::get(desktop)->stop();
+        }
+            
         break;
     }
 

diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index 9809ee848e28162e35a63958508c538b55c08287..e046fb57338b67f5ce9a28878c9ebbe91379113b 100644 (file)
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -567,13 +567,13 @@ void ink_node_tool_update_tip(InkNodeTool *nt, GdkEvent *event)
             // TRANSLATORS: The %s below is where the "%u of %u nodes selected" sentence gets put
             char *dyntip = g_strdup_printf(C_("Node tool tip",
                 "%s Drag to select nodes, click to edit only this object (more: Shift)"),
-                nodestring, sz, total);
+                nodestring);
             nt->_node_message_context->set(Inkscape::NORMAL_MESSAGE, dyntip);
             g_free(dyntip);
         } else {
             char *dyntip = g_strdup_printf(C_("Node tool tip",
                 "%s Drag to select nodes, click clear the selection"),
-                nodestring, sz, total);
+                nodestring);
             nt->_node_message_context->set(Inkscape::NORMAL_MESSAGE, dyntip);
             g_free(dyntip);
         }