diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 5d908ff39..2d74712fd 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1142,6 +1142,7 @@ recordingmenu.no_scart Unterdrücke Scart-Umschaltung recordingmenu.off aus recordingmenu.record_in_spts_mode in SPTS-Modus aufnehmen recordingmenu.record_is_running Aufnahme läuft! +recordingmenu.record_is_not_running Keine laufende Aufnahme verfügbar! recordingmenu.recording_type Aufnahme Gerät recordingmenu.ringbuffers Anz. Ringpuffer recordingmenu.save_in_channeldir Speichere im Kanalverzeichnis diff --git a/data/locale/english.locale b/data/locale/english.locale index 81999a4ca..e106a534f 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1142,6 +1142,7 @@ recordingmenu.no_scart do not switch to scart mode recordingmenu.off off recordingmenu.record_in_spts_mode switch to spts mode before recording recordingmenu.record_is_running Record is running! +recordingmenu.record_is_not_running No record is running! recordingmenu.recording_type recording device recordingmenu.ringbuffers no. of ringbuffers recordingmenu.save_in_channeldir Save in channel dir diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 837b9e977..8845fa77a 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1229,7 +1229,14 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey ) { StartTimeshift(); return menu_return::RETURN_EXIT_ALL; + }else if(actionKey == "Stop_record") + { + if(!CRecordManager::getInstance()->RecordingStatus()) { + ShowHintUTF(LOCALE_MAINMENU_RECORDING_STOP, g_Locale->getText(LOCALE_RECORDINGMENU_RECORD_IS_NOT_RUNNING), 450, 2); + return menu_return::RETURN_EXIT_ALL; + } } + ShowMenu(); return menu_return::RETURN_REPAINT; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 55661f940..0ed6ca65c 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2344,10 +2344,8 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) CRecordManager::getInstance()->exec(NULL, "Record"); } else if( msg == CRCInput::RC_stop ) { - if(CRecordManager::getInstance()->RecordingStatus()) - CRecordManager::getInstance()->ShowMenu(); + CRecordManager::getInstance()->exec(NULL, "Stop_record"); } - else if( msg == CRCInput::RC_red ) { StopSubtitles(); usermenu.showUserMenu(SNeutrinoSettings::BUTTON_RED); diff --git a/src/system/locals.h b/src/system/locals.h index abdea83a4..25b28cbce 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1169,6 +1169,7 @@ typedef enum LOCALE_RECORDINGMENU_OFF, LOCALE_RECORDINGMENU_RECORD_IN_SPTS_MODE, LOCALE_RECORDINGMENU_RECORD_IS_RUNNING, + LOCALE_RECORDINGMENU_RECORD_IS_NOT_RUNNING, LOCALE_RECORDINGMENU_RECORDING_TYPE, LOCALE_RECORDINGMENU_RINGBUFFERS, LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 9e49f8a42..867e53c76 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1169,6 +1169,7 @@ const char * locale_real_names[] = "recordingmenu.off", "recordingmenu.record_in_spts_mode", "recordingmenu.record_is_running", + "recordingmenu.record_is_not_running", "recordingmenu.recording_type", "recordingmenu.ringbuffers", "recordingmenu.save_in_channeldir",