diff --git a/autorun.sh b/autorun.sh index 44509a10c..cfa78ccf9 100755 --- a/autorun.sh +++ b/autorun.sh @@ -8,7 +8,6 @@ ERROR=-1 NORMAL=0 SHUTDOWN=1 REBOOT=2 -RESTART=3 echo "Starting Neutrino" diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index 86fd3146b..30f51fc6c 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -140,7 +140,7 @@ bc.control.reboot=Neustart bc.control.shutdown.ask=Box wirklich ausschalten? bc.control.shutdown=Ausschalten bc.control.status=Status -bc.control.restart=Neustart +bc.control.restart=neu starten bc.control.neutrino=Neutrino ========= Boxcontrol - Message diff --git a/src/neutrino.cpp b/src/neutrino.cpp index beb96e448..0b66171f0 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4538,7 +4538,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) return messages_return::handled; } else if( msg == NeutrinoMessages::RESTART ) { - ExitRun(CNeutrinoApp::EXIT_RESTART); + CNeutrinoApp::getInstance()->exec(NULL, "restart"); } else if( msg == NeutrinoMessages::REBOOT ) { ExitRun(CNeutrinoApp::EXIT_REBOOT); @@ -4818,7 +4818,7 @@ void CNeutrinoApp::ExitRun(int exit_code) if (cs_get_revision() != 10) bright = g_settings.lcd_setting[SNeutrinoSettings::LCD_DEEPSTANDBY_BRIGHTNESS]; #endif - if (exit_code != EXIT_NORMAL && exit_code != EXIT_RESTART) + if (exit_code != CNeutrinoApp::EXIT_REBOOT) { if (timer_minutes) { @@ -5373,12 +5373,6 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) ExitRun(CNeutrinoApp::EXIT_REBOOT); returnval = menu_return::RETURN_NONE; } - else if (actionKey=="restart") - { - videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0); - ExitRun(CNeutrinoApp::EXIT_RESTART); - returnval = menu_return::RETURN_NONE; - } else if (actionKey=="clock_switch") { InfoClock->switchClockOnOff(); @@ -5502,6 +5496,8 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) #ifdef ENABLE_LCD4LINUX CLCD4l::getInstance()->StopLCD4l(); #endif + StopSubtitles(); + stopPlayBack(); saveSetup(NEUTRINO_SETTINGS_FILE); diff --git a/src/neutrino.h b/src/neutrino.h index 22eb60194..81b090d8e 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -62,8 +62,7 @@ public: EXIT_ERROR = -1, EXIT_NORMAL = 0, // g_info.hw_caps->can_shutdown == 0 EXIT_SHUTDOWN = 1, // g_info.hw_caps->can_shutdown == 1 - EXIT_REBOOT = 2, - EXIT_RESTART = 3 + EXIT_REBOOT = 2 }; enum @@ -197,7 +196,7 @@ public: void switchTvRadioMode(const int prev_mode = NeutrinoModes::mode_unknown); time_t getStartTime() { return neutrino_start_time; } - + bool isMuted() {return current_muted; } void setCurrentMuted(int m) { current_muted = m; } int recordingstatus;