Stream fixes

diff --git a/GNUmakefile b/GNUmakefile
index ec80be730efcd45f0e25a75b499e8f64f5721170..c87974476cae1c453b2019561002a46df135efcf 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -50,7 +50,7 @@ install-dev:
        cp vompclient /mnt/auto/defiant/diskless/nfs/mvp-dev
 
 debug:
-       ../../gdb/gdb-6.7/gdb/gdb /diskless/nfs/mvp/vompclient /diskless/nfs/mvp/core.*
+       ../../gdb/gdb-6.7/gdb/gdb /mnt/auto/defiant/diskless/nfs/mvp/vompclient /mnt/auto/defiant/diskless/nfs/mvp/core.*
 
 debug2:
        ../../gdb/gdb-6.7/gdb/gdb /mnt/auto/defiant/diskless/nfs/mvp-dev/vompclient /mnt/auto/defiant/diskless/nfs/mvp-dev/core.*

diff --git a/vdr.cc b/vdr.cc
index 33632e8727b9ef5e46495a195bc9b2be0f8be2af..6e6f54173eac195d51789d02e0d4f6d2a0e11aae 100644 (file)
--- a/vdr.cc
+++ b/vdr.cc
@@ -587,9 +587,13 @@ int VDR::stopStreaming()
   VDR_RequestPacket vrp;
   if (!vrp.init(VDR_STOPSTREAMING, true, 0)) return 0;
 
-  edUnregister(TEMP_SINGLE_VDR_PR);
-  delete TEMP_SINGLE_VDR_PR;
-  TEMP_SINGLE_VDR_PR = NULL;
+  if (TEMP_SINGLE_VDR_PR) // this block only needs to be done if it was a live stream
+                          // TEMP_SINGLE_VDR_PR will not be set unless we are streaming a channel
+  {
+    edUnregister(TEMP_SINGLE_VDR_PR);
+    delete TEMP_SINGLE_VDR_PR;
+    TEMP_SINGLE_VDR_PR = NULL;
+  }
 
   VDR_ResponsePacket* vresp = RequestResponse(&vrp);
   if (vresp->noResponse()) { delete vresp; return 0; }