summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS4
-rw-r--r--HISTORY4
-rw-r--r--config.h10
-rw-r--r--vdr.c4
4 files changed, 14 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 58f52aa7..f44db37f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1876,3 +1876,7 @@ Nino Gerbino <ngerb@interfree.it>
Markus Ehrnsperger <markus.ehrnsperger@googlemail.com>
for reporting a problem with missing 'INCLUDES += -I$(DVBDIR)/include' in an existing
Make.config
+
+Werner Färber <w.faerber@gmx.de>
+ for reporting a bug in handling the cPluginManager::Active() result when pressing
+ the "Power" key
diff --git a/HISTORY b/HISTORY
index b16e8b55..8be007c0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4656,7 +4656,7 @@ Video Disk Recorder Revision History
- Ignoring k_Repeat when deciding whether the same key has been pressed in string
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 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).
- Added a note about adding 'INCLUDES += -I$(DVBDIR)/include' to an existing
Make.config (problem reported by Markus Ehrnsperger).
+- Fixed handling the cPluginManager::Active() result when pressing the "Power" key
+ (reported by Werner Färber).
diff --git a/config.h b/config.h
index 946d8529..ddac5021 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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
@@ -21,13 +21,13 @@
// VDR's own version number:
-#define VDRVERSION "1.4.0"
-#define VDRVERSNUM 10400 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.3.49"
+#define VDRVERSNUM 10349 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
-#define APIVERSION "1.4.0"
-#define APIVERSNUM 10400 // Version * 10000 + Major * 100 + Minor
+#define APIVERSION "1.3.47"
+#define APIVERSNUM 10347 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to
diff --git a/vdr.c b/vdr.c
index ff87c030..773d704b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* 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>
@@ -980,7 +980,7 @@ int main(int argc, char *argv[])
if (Interface->Confirm(tr("Recording - shut down anyway?")))
ForceShutdown = true;
}
- if (cPluginManager::Active(tr("shut down anyway?")))
+ if (!cPluginManager::Active(tr("shut down anyway?")))
ForceShutdown = true;
LastActivity = 1; // not 0, see below!
UserShutdown = true;