Fixed a deadlock in accessing marks

1 files changed, 7 insertions, 7 deletions

diff --git a/menu.c b/menu.c
index fd18c1bb..6f942437 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.43 2015/02/06 15:20:11 kls Exp $
+ * $Id: menu.c 3.44 2015/02/07 14:14:50 kls Exp $
  */
 
 #include "menu.h"
@@ -5390,11 +5390,15 @@ void cReplayControl::MarkToggle(void)
   int Current, Total;
   if (GetIndex(Current, Total, true)) {
      lastCurrent = -1; // triggers redisplay
-     cMutexLock MutexLock(&marks);
-     if (cMark *m = marks.Get(Current))
+     if (cMark *m = marks.Get(Current)) {
+        marks.Lock();
         marks.Del(m);
+        marks.Unlock();
+        }
      else {
+        marks.Lock();
         marks.Add(Current);
+        marks.Unlock();
         bool Play, Forward;
         int Speed;
         if (Setup.PauseOnMarkSet || GetReplayMode(Play, Forward, Speed) && !Play) {
@@ -5411,7 +5415,6 @@ void cReplayControl::MarkJump(bool Forward)
 {
   int Current, Total;
   if (GetIndex(Current, Total)) {
-     cMutexLock MutexLock(&marks);
      if (marks.Count()) {
         if (cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current)) {
            if (!Setup.PauseOnMarkJump) {
@@ -5440,7 +5443,6 @@ void cReplayControl::MarkMove(int Frames, bool MarkRequired)
      bool Play, Forward;
      int Speed;
      GetReplayMode(Play, Forward, Speed);
-     cMutexLock MutexLock(&marks);
      cMark *m = marks.Get(Current);
      if (!Play && m) {
         displayFrames = true;
@@ -5476,7 +5478,6 @@ void cReplayControl::EditCut(void)
   if (*fileName) {
      Hide();
      if (!RecordingsHandler.GetUsage(fileName)) {
-        cMutexLock MutexLock(&marks);
         if (!marks.Count())
            Skins.Message(mtError, tr("No editing marks defined!"));
         else if (!marks.GetNumSequences())
@@ -5498,7 +5499,6 @@ void cReplayControl::EditTest(void)
 {
   int Current, Total;
   if (GetIndex(Current, Total)) {
-     cMutexLock MutexLock(&marks);
      cMark *m = marks.Get(Current);
      if (!m)
         m = marks.GetNext(Current);