pvr: don't lock while deleting a recording and only update the list a…

…fter recording once. fixes possible deadlock when deleting a recording
opdenkamp · Apr 17, 2011 · 9033a90 · 9033a90
1 parent 64874d6
commit 9033a90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/xbmc/pvr/recordings/PVRRecordings.cpp b/xbmc/pvr/recordings/PVRRecordings.cpp
@@ -227,8 +227,6 @@ bool CPVRRecordings::DeleteRecording(const CFileItem &item)
   }
 
   CPVRRecording *tag = (CPVRRecording *)item.GetPVRRecordingInfoTag();
-  CSingleLock lock(m_critSection);
-
   return tag->Delete();
 }
 

diff --git a/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp b/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
@@ -175,7 +175,7 @@ bool CGUIWindowPVRRecordings::OnContextButtonDelete(CFileItem *item, CONTEXT_BUT
 
   if (button == CONTEXT_BUTTON_DELETE)
   {
-    bReturn = true;
+    bReturn = false;
 
     CGUIDialogYesNo* pDialog = (CGUIDialogYesNo*)g_windowManager.GetWindow(WINDOW_DIALOG_YES_NO);
     if (!pDialog)
@@ -189,10 +189,7 @@ bool CGUIWindowPVRRecordings::OnContextButtonDelete(CFileItem *item, CONTEXT_BUT
     if (!pDialog->IsConfirmed())
       return bReturn;
 
-    if (g_PVRRecordings->DeleteRecording(*item))
-    {
-      g_PVRManager.TriggerRecordingsUpdate();
-    }
+    bReturn = g_PVRRecordings->DeleteRecording(*item);
   }
 
   return bReturn;