From db71efdc01a1b0ad729220cd8e137ecd4cd25334 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 29 Feb 2016 00:12:41 +0100 Subject: [PATCH] adzap: don't leave all menues, when adzap isn't active Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6d4aba4a6ca3467524356e63753139dc3f36794e Author: vanhofen Date: 2016-02-29 (Mon, 29 Feb 2016) Origin message was: ------------------ - adzap: don't leave all menues, when adzap isn't active ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index c8cc9041b..0a581c21f 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4005,7 +4005,10 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) } else if(actionKey == "adzap") { CAdZapMenu::getInstance()->exec(parent, "adzap"); - return menu_return::RETURN_EXIT_ALL; + if (CAdZapMenu::getInstance()->isActive()) + return menu_return::RETURN_EXIT_ALL; + else + return menu_return::RETURN_REPAINT; } else if(actionKey == "moviedir") { parent->hide();