frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a possible deadlock when canceling an editing process

Browse Source
This commit is contained in:
Klaus Schmidinger
2025-01-10 13:12:04 +01:00
parent 7ab94c7bcb
commit de5327a048
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@@ -10034,7 +10034,7 @@ Video Disk Recorder Revision History
(suggested by Stefan Hofmann). (suggested by Stefan Hofmann).
- Added vdrrootdir and incdir to vdr.pc (thanks to Stefan Hofmann). - Added vdrrootdir and incdir to vdr.pc (thanks to Stefan Hofmann).
2025-01-07: 2025-01-10:
- Removed all DEPRECATED_* code. - Removed all DEPRECATED_* code.
- Fixed error checking in case the fps value can't be determined by the frame parser. - Fixed error checking in case the fps value can't be determined by the frame parser.
@@ -10047,3 +10047,4 @@ Video Disk Recorder Revision History
- Fixed handling the fps value if it can't be determined from the video data. - Fixed handling the fps value if it can't be determined from the video data.
- Fixed accessing a timer's event schedule in case the event has been removed from the - Fixed accessing a timer's event schedule in case the event has been removed from the
schedule. schedule.
- Fixed a possible deadlock when canceling an editing process.

7
cutter.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: cutter.c 5.3 2024/09/20 21:34:18 kls Exp $ * $Id: cutter.c 5.4 2025/01/10 13:12:04 kls Exp $
*/ */
#include "cutter.h" #include "cutter.h"
@@ -623,8 +623,11 @@ void cCuttingThread::HandleErrors(bool Force)
Force = true; Force = true;
} }
if (Force) { if (Force) {
LOCK_RECORDINGS_WRITE; cStateKey StateKey;
if (cRecordings *Recordings = cRecordings::GetRecordingsWrite(StateKey, 1)) {
Recordings->UpdateByName(editedRecordingName); Recordings->UpdateByName(editedRecordingName);
StateKey.Remove();
}
} }
lastErrorHandling = time(NULL); lastErrorHandling = time(NULL);
} }