Windows patches for -2

diff --git a/audiowin.cc b/audiowin.cc
index 13f7130867c04aa1962dafde0fd3d92e4045c999..dc01351066405cbae72f304986c20f23d793b980 100644 (file)
--- a/audiowin.cc
+++ b/audiowin.cc
@@ -342,10 +342,14 @@ bool AudioWin::loadOptionsfromServer(VDR* vdr)
 
 bool AudioWin::saveOptionstoServer()
 {
-    VDR::getInstance()->configSave("DirectShow",
-        "AudioFilter",audiofilterlist[audiofilterselected].displayname);
-    VDR::getInstance()->configSave("DirectShow",
-        "Mp3AudioFilter",mp3audiofilterlist[mp3audiofilterselected].displayname);
+    if (audiofilterselected!=-1) {
+        VDR::getInstance()->configSave("DirectShow",
+            "AudioFilter",audiofilterlist[audiofilterselected].displayname);
+    }
+    if (mp3audiofilterselected!=-1) {
+        VDR::getInstance()->configSave("DirectShow",
+            "Mp3AudioFilter",mp3audiofilterlist[mp3audiofilterselected].displayname);
+    }
     return true;
 }
 

diff --git a/videowin.cc b/videowin.cc
index 0115fa552194f82c1728fb208678710df1d3927b..9eeae3eda354511aa146719dbf8857cae49d2ff2 100644 (file)
--- a/videowin.cc
+++ b/videowin.cc
@@ -306,8 +306,10 @@ bool VideoWin::loadOptionsfromServer(VDR* vdr)
 
 bool VideoWin::saveOptionstoServer()
 {
-    VDR::getInstance()->configSave("DirectShow",
-        "VideoFilter",videofilterlist[videofilterselected].displayname);
+    if (videofilterselected!=-1) {
+        VDR::getInstance()->configSave("DirectShow",
+            "VideoFilter",videofilterlist[videofilterselected].displayname);
+    }
     return true;
 }
 
@@ -504,7 +506,7 @@ bool VideoWin::selectVideoFilter(int filter)
     }
     bindctx->Release();
     delete [] name;
-    if (success) 
+    if (success || true) 
     {
         videofilterselected=filter;
         return true;