diff options
author | Memphiz <memphis@machzwo.de> | 2013-12-15 13:57:06 -0800 |
---|---|---|
committer | Memphiz <memphis@machzwo.de> | 2013-12-15 13:57:06 -0800 |
commit | decc3fbdcc52b92f84841322b73a7396f2efabd0 (patch) | |
tree | 8d2824343da5eab5c759fbd3c629cb10927a5fed | |
parent | 9ef8fab52437d735bfc42710ca835593cfa01c1f (diff) | |
parent | 0caed8d3ab8f2f160ebb1b07746c7cd9ba6d82c3 (diff) |
Merge pull request #3812 from Memphiz/iosshutdownmenu
[ios/atv2] - harmonize the behaviour of builtin "shutdownmenu"
-rw-r--r-- | xbmc/interfaces/Builtins.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp index 31234546e9..3cca9538a7 100644 --- a/xbmc/interfaces/Builtins.cpp +++ b/xbmc/interfaces/Builtins.cpp @@ -392,10 +392,6 @@ int CBuiltins::Execute(const CStdString& execString) { // disable the screensaver g_application.WakeUpScreenSaverAndDPMS(); -#if defined(TARGET_DARWIN_IOS) - if (params[0].Equals("shutdownmenu")) - CBuiltins::Execute("Quit"); -#endif g_windowManager.ActivateWindow(iWindow, params, !execute.Equals("activatewindow")); } else @@ -421,10 +417,6 @@ int CBuiltins::Execute(const CStdString& execString) { // disable the screensaver g_application.WakeUpScreenSaverAndDPMS(); -#if defined(TARGET_DARWIN_IOS) - if (params[0].Equals("shutdownmenu")) - CBuiltins::Execute("Quit"); -#endif vector<CStdString> dummy; g_windowManager.ActivateWindow(iWindow, dummy, !execute.Equals("activatewindowandfocus")); |