frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed handling the cPluginManager::Active() result when pressing the "Power" key

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-04-28 12:33:13 +02:00
parent 4ebc8393ee
commit 40832856f7
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -1876,3 +1876,7 @@ Nino Gerbino <ngerb@interfree.it>
Markus Ehrnsperger <markus.ehrnsperger@googlemail.com> Markus Ehrnsperger <markus.ehrnsperger@googlemail.com>
for reporting a problem with missing 'INCLUDES += -I$(DVBDIR)/include' in an existing for reporting a problem with missing 'INCLUDES += -I$(DVBDIR)/include' in an existing
Make.config Make.config
Werner Färber <w.faerber@gmx.de>
for reporting a bug in handling the cPluginManager::Active() result when pressing
the "Power" key

4
HISTORY
View File

@ -4656,7 +4656,7 @@ Video Disk Recorder Revision History
- Ignoring k_Repeat when deciding whether the same key has been pressed in string - Ignoring k_Repeat when deciding whether the same key has been pressed in string
input fields (based on a patch from Marko Mäkelä). input fields (based on a patch from Marko Mäkelä).
2006-04-25: Version 1.4.0 2006-04-28: Version 1.3.49
- Fixed initializing 'noapiv' in the Makefile (reported by Ronny Kornexl). - Fixed initializing 'noapiv' in the Makefile (reported by Ronny Kornexl).
- Fixed extracting APIVERSION to work with older versions of 'sed' (reported by - Fixed extracting APIVERSION to work with older versions of 'sed' (reported by
@ -4667,3 +4667,5 @@ Video Disk Recorder Revision History
- Updated the Italian OSD texts (thanks to Nino Gerbino). - Updated the Italian OSD texts (thanks to Nino Gerbino).
- Added a note about adding 'INCLUDES += -I$(DVBDIR)/include' to an existing - Added a note about adding 'INCLUDES += -I$(DVBDIR)/include' to an existing
Make.config (problem reported by Markus Ehrnsperger). Make.config (problem reported by Markus Ehrnsperger).
- Fixed handling the cPluginManager::Active() result when pressing the "Power" key
(reported by Werner Färber).

10
config.h
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: config.h 1.253 2006/04/24 17:08:38 kls Exp $ * $Id: config.h 1.254 2006/04/28 12:33:13 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -21,13 +21,13 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "1.4.0" #define VDRVERSION "1.3.49"
#define VDRVERSNUM 10400 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10349 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:
#define APIVERSION "1.4.0" #define APIVERSION "1.3.47"
#define APIVERSNUM 10400 // Version * 10000 + Major * 100 + Minor #define APIVERSNUM 10347 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which // When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to // may be smaller than VDRVERSION in case there have been no changes to

4
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * The project's page is at http://www.cadsoft.de/vdr
* *
* $Id: vdr.c 1.264 2006/04/22 11:26:04 kls Exp $ * $Id: vdr.c 1.265 2006/04/28 12:24:04 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -980,7 +980,7 @@ int main(int argc, char *argv[])
if (Interface->Confirm(tr("Recording - shut down anyway?"))) if (Interface->Confirm(tr("Recording - shut down anyway?")))
ForceShutdown = true; ForceShutdown = true;
} }
if (cPluginManager::Active(tr("shut down anyway?"))) if (!cPluginManager::Active(tr("shut down anyway?")))
ForceShutdown = true; ForceShutdown = true;
LastActivity = 1; // not 0, see below! LastActivity = 1; // not 0, see below!
UserShutdown = true; UserShutdown = true;