X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/544e1af49c6c1c25a3ef97b27ac3e6764a008824..883a9c93798e01fc2825673799f48bf2a0a68d15:/lib/base/filepush.cpp

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index e99e956c..605ec8a8 100644
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -189,9 +189,15 @@ void eFilePushThread::thread()
 			if (m_send_pvr_commit && !already_empty)
 			{
 				eDebug("sending PVR commit");
+				
+				struct pollfd pfd;
+				pfd.fd = m_fd_dest;
+				pfd.events = POLLPRI;
+				poll(&pfd, 1, 10000);
+				sleep(5); /* HACK to allow ES buffer to drain */
 				already_empty = 1;
-				if (::ioctl(m_fd_dest, PVR_COMMIT) < 0 && errno == EINTR)
-					continue;
+//				if (::ioctl(m_fd_dest, PVR_COMMIT) < 0 && errno == EINTR)
+//					continue;
 				eDebug("commit done");
 						/* well check again */
 				continue;
@@ -257,10 +263,7 @@ void eFilePushThread::stop()
 
 	m_stop = 1;
 
-	// fixmee.. here we need a better solution to ensure
-	// that the thread context take notice of the signal
-	// even when no syscall is in progress
-	eDebug("if enigma hangs here, the filepush thread is non-responsive. FIX THAT DAMN THREAD.");
+	eDebug("stopping thread."); /* just do it ONCE. it won't help to do this more than once. */
 	sendSignal(SIGUSR1);
 	kill(0);
 }