Fix wait if data is already there

1 files changed, 6 insertions, 3 deletions

diff --git a/tools/future.h b/tools/future.h
index 73d4bfec..bdd0498c 100644
--- a/tools/future.h
+++ b/tools/future.h
@@ -5,7 +5,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: future.h,v 1.1 2006-06-03 10:04:27 phintuka Exp $
+ * $Id: future.h,v 1.2 2006-08-19 23:44:07 phintuka Exp $
  *
  */
 
@@ -56,13 +56,16 @@ class cFuture {
     {
       cMutexLock l(&mutex);
 
+      if(Timeout==0 || m_Ready)
+	return m_Ready;
+
       if(Timeout >= 0)
-	return cond.TimedWait(mutex, Timeout);
+	return cond.TimedWait(mutex, Timeout) && m_Ready;
 
       while(!m_Ready)
 	cond.Wait(mutex);
 
-      return true;
+      return m_Ready;
     }
 
     bool IsReady(void)