diff --git a/HISTORY b/HISTORY
index 5f958f7..7d6e0c4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -395,3 +395,7 @@ VDR Plugin 'femon' Revision History
 - Updated for vdr-1.7.13.
 - Added a setup option to downscale the OSD size.
 - Updated Estonian translation (Thanks to Arthur Konovalov).
+
+2010-xx-xx: Version 1.7.8
+
+- Fixed device switching.
diff --git a/Makefile b/Makefile
index 02a6916..91f75b9 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ TMPDIR = /tmp
 
 ### Make sure that necessary options are included:
 
-include $(VDRDIR)/Make.global
+-include $(VDRDIR)/Make.global
 
 ### Allow user defined options to overwrite defaults:
 
diff --git a/femon.c b/femon.c
index 360bfdc..335f10c 100644
--- a/femon.c
+++ b/femon.c
@@ -18,7 +18,7 @@
 #error "VDR-1.7.13 API version or greater is required!"
 #endif
 
-static const char VERSION[]       = "1.7.7";
+static const char VERSION[]       = "1.7.8";
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 
diff --git a/femonosd.c b/femonosd.c
index 1d66ab3..e97914c 100644
--- a/femonosd.c
+++ b/femonosd.c
@@ -697,7 +697,7 @@ bool cFemonOsd::DeviceSwitch(int direction)
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
      if (channel) {
         for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
-           if (direction) {
+           if (direction >= 0) {
               if (++device >= cDevice::NumDevices())
                  device = 0;
               }