From aaf404610da205e55d3bd156e994ad31a89cf1ee Mon Sep 17 00:00:00 2001
From: Chris Tallon <chris@vomp.tv>
Date: Tue, 6 May 2008 22:06:33 +0000
Subject: [PATCH] Stream fixes

---
 GNUmakefile |  2 +-
 vdr.cc      | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index ec80be7..c879744 100644
--- 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 33632e8..6e6f541 100644
--- 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; }
-- 
2.39.2