From ddc018cef1172324c1b6773fc8695b8f9f96ca1d Mon Sep 17 00:00:00 2001 From: drgondjf Date: Fri, 21 Jul 2017 14:42:06 +0800 Subject: [PATCH] Fix menu action of window exec failed Change-Id: Idf8e055fb2cda74086991f750177fce45be8b4c0 --- common/common.pri | 2 +- dde-file-manager-lib/interfaces/dfilemenumanager.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/common.pri b/common/common.pri index 8751367c7d..371e5f5443 100644 --- a/common/common.pri +++ b/common/common.pri @@ -44,7 +44,7 @@ unix { DEFINES += PLUGINDIR=\\\"$$top_srcdir/plugins:$$PLUGINDIR\\\" isEmpty(VERSION) { - VERSION = 1.4 + VERSION = 1.5 } } diff --git a/dde-file-manager-lib/interfaces/dfilemenumanager.cpp b/dde-file-manager-lib/interfaces/dfilemenumanager.cpp index a6e80841c2..02f482850f 100644 --- a/dde-file-manager-lib/interfaces/dfilemenumanager.cpp +++ b/dde-file-manager-lib/interfaces/dfilemenumanager.cpp @@ -856,6 +856,7 @@ MenuAction DFileMenuManager::registerMenuActionType(QAction *action) void DFileMenuManager::actionTriggered(QAction *action) { + qDebug() << action << action->data().isValid(); DFileMenu *menu = qobject_cast(sender()); if (action->data().isValid()) { @@ -872,7 +873,8 @@ void DFileMenuManager::actionTriggered(QAction *action) if (type >= MenuAction::UserMenuAction) return; - if (DFileMenuData::actions.value(type) == action) { + qDebug() << type << DFileMenuData::actions.value(type); + if (DFileMenuData::actions.value(type)->text() == action->text()) { const QSharedPointer &event = menu->makeEvent(type); DFMEventDispatcher::instance()->processEvent(event); }