2 files changed, 3 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index f457a25d..70e40f0e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5543,3 +5543,4 @@ Video Disk Recorder Revision History
 - Added cString::Truncate().
 - Fixed the "i18n:" target in the "newplugin" script, so that it can create the
   initial *.pot file.
+- Fixed handling the '-l' option.
diff --git a/vdr.c b/vdr.c
index 6a8ac574..05b9e487 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.304 2008/01/06 11:48:14 kls Exp $
+ * $Id: vdr.c 1.305 2008/01/13 11:51:53 kls Exp $
  */
 
 #include <getopt.h>
@@ -304,7 +304,7 @@ int main(int argc, char *argv[])
                        }
                     break;
           case 'l' | 0x100:
-                    LircDevice = optarg ? : LIRC_DEVICE;
+                    LircDevice = optarg ? optarg : LIRC_DEVICE;
                     break;
           case 'm': MuteAudio = true;
                     break;