From 107f8e26adb9463162c554fedd8d97c4e84a25d7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 1 Oct 2014 22:40:06 +0200 Subject: [PATCH] CPluginsExec::exec(): don't leave current menu when exiting integrated plugins Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/cf53191122ae8e7047b8a7f5eafb1e21233dfd87 Author: vanhofen Date: 2014-10-01 (Wed, 01 Oct 2014) Origin message was: ------------------ - CPluginsExec::exec(): don't leave current menu when exiting integrated plugins --- src/system/setting_helpers.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 0bd6aecc4..382710c69 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -374,7 +374,10 @@ int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey) g_PluginList->startPlugin(sel); } - return menu_return::RETURN_EXIT; + if (g_PluginList->getIntegration(sel) == CPlugins::I_TYPE_DISABLED) + return menu_return::RETURN_EXIT; + + return menu_return::RETURN_REPAINT; } int CMoviePluginChangeExec::exec(CMenuTarget* parent, const std::string & actionKey)