mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed a problem with @plugin in keymacros.conf in case the named plugin is not loaded
This commit is contained in:
parent
29501203f7
commit
ef385702d0
@ -1663,3 +1663,7 @@ Jesus Bravo Alvarez <jba@pobox.com>
|
||||
Francois-Xavier Kowalski <francois-xavier.kowalski@hp.com>
|
||||
for suggesting how to modify logging so that even on NPTL systems each line in
|
||||
the log file shows the individual thread's pid
|
||||
|
||||
Franz Gangkofer <Franz.Gangkofer@cadsoft.de>
|
||||
for reporting a problem with @plugin in keymacros.conf in case the named plugin
|
||||
is not loaded
|
||||
|
4
HISTORY
4
HISTORY
@ -4190,9 +4190,11 @@ Video Disk Recorder Revision History
|
||||
- No longer displaying color buttons in the recording info menu if it has been
|
||||
invoked from a player (reported by Jürgen Schilling).
|
||||
|
||||
2006-01-15: Version 1.3.40
|
||||
2006-01-20: Version 1.3.40
|
||||
|
||||
- Fixed a second place where a message should be given when an instant recording
|
||||
is started (reported by Jesus Bravo Alvarez).
|
||||
- Modified logging so that even on NPTL systems each line in the log file shows
|
||||
the individual thread's pid (based on a suggestion from Francois-Xavier Kowalski).
|
||||
- Fixed a problem with @plugin in keymacros.conf in case the named plugin is not
|
||||
loaded (reported by Franz Gangkofer).
|
||||
|
4
keys.c
4
keys.c
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: keys.c 1.10 2006/01/05 15:39:26 kls Exp $
|
||||
* $Id: keys.c 1.11 2006/01/16 17:01:25 kls Exp $
|
||||
*/
|
||||
|
||||
#include "keys.h"
|
||||
@ -250,9 +250,11 @@ cKeyMacros KeyMacros;
|
||||
|
||||
const cKeyMacro *cKeyMacros::Get(eKeys Key)
|
||||
{
|
||||
if (Key != kNone) {
|
||||
for (cKeyMacro *k = First(); k; k = Next(k)) {
|
||||
if (*k->Macro() == Key)
|
||||
return k;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
4
vdr.c
4
vdr.c
@ -22,7 +22,7 @@
|
||||
*
|
||||
* The project's page is at http://www.cadsoft.de/vdr
|
||||
*
|
||||
* $Id: vdr.c 1.240 2006/01/15 16:23:21 kls Exp $
|
||||
* $Id: vdr.c 1.241 2006/01/16 17:05:49 kls Exp $
|
||||
*/
|
||||
|
||||
#include <getopt.h>
|
||||
@ -985,7 +985,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
else {
|
||||
// Key functions in "normal" viewing mode:
|
||||
if (KeyMacros.Get(key)) {
|
||||
if (key != kNone && KeyMacros.Get(key)) {
|
||||
cRemote::PutMacro(key);
|
||||
key = kNone;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user