summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2019-08-11 06:25:30 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-08-11 06:25:30 +0000
commit460193870ad22ad7611978c5d139149909f56664 (patch)
tree67013889d7540c4e6b9943958b31390bd18aad11 /src
parentImprove tooltip text for linking in LPEs again. (diff)
downloadinkscape-460193870ad22ad7611978c5d139149909f56664.tar.gz
inkscape-460193870ad22ad7611978c5d139149909f56664.zip
Fix issue pointed by Nathan
Diffstat (limited to 'src')
-rw-r--r--src/ui/desktop/menubar.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ui/desktop/menubar.cpp b/src/ui/desktop/menubar.cpp
index 39496afad..6389def6a 100644
--- a/src/ui/desktop/menubar.cpp
+++ b/src/ui/desktop/menubar.cpp
@@ -42,7 +42,7 @@
// ================= Common ====================
std::vector<std::pair<unsigned int, Gtk::CheckMenuItem *>> checkmenuitems;
-unsigned int lastverb = 0;
+unsigned int lastverb = std::string::npos;
;
// Sets tip
@@ -63,11 +63,12 @@ deselect_action(SPAction *action)
static void item_activate(Gtk::MenuItem *menuitem, SPAction *action)
{
if (action->verb->get_code() == lastverb) {
- lastverb = 0;
+ lastverb = std::string::npos;
return;
}
lastverb = action->verb->get_code();
sp_action_perform(action, nullptr);
+ lastverb = std::string::npos;
}
static void toggle_checkmenu(unsigned int emitting_verb, bool value)
@@ -75,11 +76,12 @@ static void toggle_checkmenu(unsigned int emitting_verb, bool value)
for (auto menu : checkmenuitems) {
if (emitting_verb == menu.first) {
if (emitting_verb == lastverb) {
- lastverb = 0;
+ lastverb = std::string::npos;
return;
}
lastverb = emitting_verb;
menu.second->property_active() = value;
+ lastverb = std::string::npos;
}
}
}