From 7b8f1ff9ce16bc2d8457362df2017bc0ffe65458 Mon Sep 17 00:00:00 2001 From: Cristian Tibirna Date: Sun, 26 Nov 2017 08:01:51 -0500 Subject: [PATCH] FIX action text being potentially altered from assigned value See https://github.com/tibirna/qgit/issues/12 --- src/mainimpl.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mainimpl.cpp b/src/mainimpl.cpp index f754fdd..7399837 100644 --- a/src/mainimpl.cpp +++ b/src/mainimpl.cpp @@ -1634,12 +1634,13 @@ void MainImpl::doUpdateCustomActionMenu(const QStringList& list) { void MainImpl::customAction_triggered(QAction* act) { - SCRef actionName = act->text(); + QString actionName = act->text(); if (actionName == "Setup actions...") return; QSettings set; - if (!set.value(ACT_LIST_KEY).toStringList().contains(actionName)) { + QStringList actionsList = set.value(ACT_LIST_KEY).toStringList(); + if (!(actionsList.contains(actionName) || actionsList.contains(actionName.remove(QChar('&'))))) { dbp("ASSERT in customAction_activated, action %1 not found", actionName); return; } -- 2.11.4.GIT