*** empty log message ***

diff --git a/command.cc b/command.cc
index 241f5380c41747a8f03f1f32a3140a81c3bdc50c..700de261bf23da8faae69ab5b82a8f2daec23ecd 100644 (file)
--- a/command.cc
+++ b/command.cc
@@ -889,10 +889,10 @@ void Command::doJustConnected(VConnect* vconnect)
     boxstack->update(vw);
 
     // Enter pre-keys here
-//    handleCommand(Remote::OK);
+    handleCommand(Remote::OK);
 //    handleCommand(Remote::ONE);
 //    handleCommand(Remote::SIX);
-//    handleCommand(Remote::OK);
+    handleCommand(Remote::OK);
 //    handleCommand(Remote::UP);
 //    handleCommand(Remote::PLAY);
 //    handleCommand(Remote::DOWN);

diff --git a/eventdispatcher.cc b/eventdispatcher.cc
index f7217f906fa80c9483a66b8d0bc55d271d774ca1..90421641c9e8490f95e3040e19fe1a521b056116 100644 (file)
--- a/eventdispatcher.cc
+++ b/eventdispatcher.cc
@@ -177,10 +177,9 @@ void EventDispatcher::edSleepThisReceiver(EDReceiver* edr)
   // For blocking version, not callback version. Call with edLock locked
   
 #ifndef WIN32
-  pthread_cond_init(&edr->cond, NULL);
   pthread_cond_wait(&edr->cond, &mutex);
 #else
-   edr->cond = CreateEvent(NULL,/*FALSE*/TRUE,FALSE,NULL);
+   ResetEvent(edr->cond);
    ReleaseMutex(mutex);
    WaitForSingleObject(edr->cond,INFINITE);
    ResetEvent(edr->cond);
@@ -194,8 +193,10 @@ EDReceiver::EDReceiver()
 {
   nomorecalls = false;
   callinprogress = false;
-#ifdef WIN32
-  cond=NULL;
+#ifndef WIN32
+  pthread_cond_init(&cond, NULL);
+#else
+   cond = CreateEvent(NULL,/*FALSE*/TRUE,FALSE,NULL);
 #endif
 }
 
@@ -203,5 +204,7 @@ EDReceiver::~EDReceiver()
 {
 #ifdef WIN32
   if (cond!=NULL) CloseHandle(cond);
+#else
+  pthread_cond_destroy(&cond);
 #endif
 }

diff --git a/vdr.cc b/vdr.cc
index 57ef49246e24af6ad4773cc1e028938332a223ca..3edf9ea14a9cb2f7aee1df2c281026712bd47f85 100644 (file)
--- a/vdr.cc
+++ b/vdr.cc
@@ -727,6 +727,7 @@ int VDR::stopStreaming()
   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
   {
+    logger->log("VDR", Log::DEBUG, "About to call edUnregister on stream receiver vdrpr");  
     edUnregister(TEMP_SINGLE_VDR_PR);
     delete TEMP_SINGLE_VDR_PR;
     TEMP_SINGLE_VDR_PR = NULL;