Added missing mutex locks to cCiMenu::Abort() and cCiEnquiry::Abort()

This commit is contained in:
Klaus Schmidinger 2005-10-30 10:27:24 +01:00
parent 64c2b3b0de
commit 3c59953017
3 changed files with 7 additions and 2 deletions

View File

@ -1236,6 +1236,7 @@ Marco Schl
for fixing handling EPG data for time shifted events for fixing handling EPG data for time shifted events
for fixing detecting short channel names for "Kabel Deutschland" for fixing detecting short channel names for "Kabel Deutschland"
for reporting that the FATALERRNO macro needs to check for a non-zero errno value for reporting that the FATALERRNO macro needs to check for a non-zero errno value
for reporting missing mutex locks in cCiMenu::Abort() and cCiEnquiry::Abort()
Jürgen Schmitz <j.schmitz@web.de> Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP for reporting a bug in displaying the current channel when switching via the SVDRP

View File

@ -3886,7 +3886,7 @@ Video Disk Recorder Revision History
- The 'sub-title' and 'bottom text' in the CAM menu can now consist of several lines. - The 'sub-title' and 'bottom text' in the CAM menu can now consist of several lines.
- Improved the CAM enquiry menu. - Improved the CAM enquiry menu.
2005-10-14: Version 1.3.35 2005-10-30: Version 1.3.35
- Updated 'sources.conf' (thanks to Philip Prindeville). - Updated 'sources.conf' (thanks to Philip Prindeville).
- Now using daemon() instead of fork() to run VDR in daemon mode (thanks to - Now using daemon() instead of fork() to run VDR in daemon mode (thanks to
@ -3903,3 +3903,5 @@ Video Disk Recorder Revision History
(thanks to Peter Bieringer). (thanks to Peter Bieringer).
- Updated the Danish OSD texts (thanks to Mogens Elneff). - Updated the Danish OSD texts (thanks to Mogens Elneff).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Added missing mutex locks to cCiMenu::Abort() and cCiEnquiry::Abort() (reported
by Marco Schlüßler).

4
ci.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: ci.c 1.36 2005/10/03 12:58:22 kls Exp $ * $Id: ci.c 1.37 2005/10/30 10:24:38 kls Exp $
*/ */
#include "ci.h" #include "ci.h"
@ -1267,6 +1267,7 @@ bool cCiMenu::Cancel(void)
bool cCiMenu::Abort(void) bool cCiMenu::Abort(void)
{ {
cMutexLock MutexLock(&mutex);
return mmi && mmi->SendCloseMMI(); return mmi && mmi->SendCloseMMI();
} }
@ -1301,6 +1302,7 @@ bool cCiEnquiry::Cancel(void)
bool cCiEnquiry::Abort(void) bool cCiEnquiry::Abort(void)
{ {
cMutexLock MutexLock(&mutex);
return mmi && mmi->SendCloseMMI(); return mmi && mmi->SendCloseMMI();
} }