frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-12-26 23:06:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a possible crash in case replay is started and stopped in rapid sequence

Browse Source
This commit is contained in:
Klaus Schmidinger
2020-05-18 16:47:29 +02:00
parent dd9dd76722
commit 196785ff05
7 changed files with 92 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
menu.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.c 4.81 2020/04/11 09:22:05 kls Exp $
* $Id: menu.c 4.82 2020/05/18 16:47:29 kls Exp $
*/
#include "menu.h"
@@ -2731,7 +2731,8 @@ eOSState cMenuRecordingEdit::DeleteMarks(void)
if (buttonDeleteMarks && Interface->Confirm(tr("Delete editing marks for this recording?"))) {
if (cMarks::DeleteMarksFile(recording)) {
SetHelpKeys();
if (cControl *Control = cControl::Control(true)) {
cMutexLock ControlMutexLock;
if (cControl *Control = cControl::Control(ControlMutexLock, true)) {
if (const cRecording *Recording = Control->GetRecording()) {
if (strcmp(recording->FileName(), Recording->FileName()) == 0)
Control->ClearEditingMarks();
@@ -4457,7 +4458,11 @@ bool cMenuMain::Update(bool Force)
{
bool result = false;
bool NewReplaying = cControl::Control() != NULL;
bool NewReplaying = false;
{
cMutexLock ControlMutexLock;
NewReplaying = cControl::Control(ControlMutexLock) != NULL;
}
if (Force || NewReplaying != replaying) {
replaying = NewReplaying;
// Replay control: