diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 17047336b..9d30313fc 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1130,7 +1130,7 @@ recordingmenu.filesettings Direktaufnahme Einstellungen recordingmenu.head Aufnahme Einstellungen recordingmenu.help Aufnahmegeräte:\n-----------------------\nServer:\nauf PC mit Hilfe eines Streaming-Programmes\n\n(analoger) Videorekorder:\nüber VCR-Ausgang\n\nDirekt (Datei):\nauf ein per NFS gemountetes Verzeichnis\noder eine interne Festplatte\nTS: SPTS-Mode Treiber laden(dbox2)\nPES: SPTS-Mode Treiber nicht laden(dbox2)\n\n\nMaximale Dateigröße:\n----------------------\nNFS V2: 2 GB (2048 MB)\nNFS V3: fast unendlich (0 MB)\nFAT: 2 GB (2048 MB)\nFAT32: 4 GB (4096 MB) recordingmenu.multimenu.ask_stop_all Wirklich alle %d Aufnahmen beenden? -recordingmenu.multimenu.info_stop_all %d Aufnahmen werden beendet. +recordingmenu.multimenu.info_stop_all %d von %d Aufnahmen werden beendet. recordingmenu.multimenu.rec_akt Aufnahme aktueller Kanal recordingmenu.multimenu.stop_all Alle Aufnahmen beenden recordingmenu.multimenu.timeshift Timeshift diff --git a/data/locale/english.locale b/data/locale/english.locale index 8bcff1d0c..0e1ed9953 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1130,7 +1130,7 @@ recordingmenu.filesettings direct recording settings recordingmenu.head Recording Settings recordingmenu.help Recording devices:\n--------------------------\nserver:\nusing streaming software on a PC\n\n(analog) vcr:\nusing the vcr outlet\n\ndirect (file):\ndirectly into an NFS mounted directory\nor onto an internal hard drive\nTS: use spts mode(dbox2)\nPES: do not use spts mode(dbox2)\n\n\nMax. file size:\n---------------------\nNFS V2: 2 GB (2048 MB)\nNFS V3: almost unlimited (0 MB)\nFAT: 2 GB (2048 MB)\nFAT32: 4 GB (4096 MB) recordingmenu.multimenu.ask_stop_all really stop all %d recordings? -recordingmenu.multimenu.info_stop_all %d recordings will be stopped. +recordingmenu.multimenu.info_stop_all %d of %d recordings will be stopped. recordingmenu.multimenu.rec_akt record current channel recordingmenu.multimenu.stop_all stop all recordings recordingmenu.multimenu.timeshift Timeshift diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 3b1b6b02c..7f9c603a6 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1160,7 +1160,6 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey ) CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, false) == CMessageBox::mbrYes) { snprintf(rec_msg1, sizeof(rec_msg1)-1, "%s", g_Locale->getText(LOCALE_RECORDINGMENU_MULTIMENU_INFO_STOP_ALL)); - snprintf(rec_msg, sizeof(rec_msg)-1, rec_msg1, records); int i = 0; int recording_ids[RECORD_MAX_COUNT]; @@ -1174,12 +1173,15 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey ) recording_ids[i] = 0; channel_id = it->first; CRecordInstance * inst = it->second; + + snprintf(rec_msg, sizeof(rec_msg)-1, rec_msg1, records-i, records); inst-> SetStopMessage(rec_msg); + if(inst) { channel_ids[i] = channel_id; recording_ids[i] = inst->GetRecordingId(); - printf("CRecordManager::exec(ExitAll) found channel %llx recording_id %d\n", channel_ids[i], recording_ids[i]); + printf("CRecordManager::exec(ExitAll line %d) found channel %llx recording_id %d\n", __LINE__, channel_ids[i], recording_ids[i]); i++; } } @@ -1190,10 +1192,13 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey ) { mutex.lock(); CRecordInstance * inst = FindInstance(channel_ids[i2]); + + snprintf(rec_msg, sizeof(rec_msg)-1, rec_msg1, records-i2, records); inst-> SetStopMessage(rec_msg); + if(inst == NULL || recording_ids[i2] != inst->GetRecordingId()) { - printf("CRecordManager::exec(ExitAll) channel %llx event id %d not found\n", channel_ids[i2], recording_ids[i2]); + printf("CRecordManager::exec(ExitAll line %d) channel %llx event id %d not found\n", __LINE__, channel_ids[i2], recording_ids[i2]); }else { usleep(500000);