From 98ed156cd1cee59249df489c117cfbe12a84c0d3 Mon Sep 17 00:00:00 2001 From: Timo Eskola Date: Wed, 5 Sep 2018 19:36:41 +0300 Subject: Fixed newly intorduced locking order issue. --- menu.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/menu.c b/menu.c index 348f4de..5fd9dfe 100644 --- a/menu.c +++ b/menu.c @@ -69,18 +69,17 @@ cMenuDuplicate::cMenuDuplicate(const cRecording *Recording) } #if VDRVERSNUM >= 20301 -bool cMenuDuplicate::RefreshRecording(void) -{ +bool cMenuDuplicate::RefreshRecording(void) { if (const cRecordings *Recordings = cRecordings::GetRecordingsRead(recordingsStateKey)) { - if ((recording = Recordings->GetByName(originalFileName)) != NULL) - Display(); - else { - recordingsStateKey.Remove(); - Skins.Message(mtWarning, trVDR("Recording vanished!")); - return false; - } - recordingsStateKey.Remove(); - } + if ((recording = Recordings->GetByName(originalFileName)) != NULL) { + recordingsStateKey.Remove(); + Display(); + } else { + recordingsStateKey.Remove(); + Skins.Message(mtWarning, trVDR("Recording vanished!")); + return false; + } + } return true; } #endif -- cgit v1.2.3