don't crash if time is *really* invalid

[enigma2.git] / lib / gdi / grc.cpp

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index e4e4a8615c5149933d063b954be6fb76225a8412..19a32b62b5c379ea095089c4131ec90b6564c450 100644 (file)
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -1,10 +1,4 @@
-// for debugging use:
-// #define SYNC_PAINT
 #include <unistd.h>
-#ifndef SYNC_PAINT
-#include <pthread.h>
-#endif
-
 #include <lib/gdi/grc.h>
 #include <lib/gdi/font.h>
 #include <lib/base/init.h>
@@ -63,8 +57,7 @@ void gRC::submit(const gOpcode &o)
 #ifndef SYNC_PAINT
                pthread_mutex_lock(&mutex);
 #endif
-               int tmp=wp;
-               tmp+=1;
+               int tmp=wp+1;
                if ( tmp == MAXSIZE )
                        tmp=0;
                if ( tmp == rp )
@@ -106,14 +99,17 @@ void *gRC::thread()
        while (rp != wp)
        {
 #endif
+#ifndef SYNC_PAINT
                pthread_mutex_lock(&mutex);
+#endif
                if ( rp != wp )
                {
-                       gOpcode o(queue[rp]);
-                       rp++;
+                       gOpcode o(queue[rp++]);
                        if ( rp == MAXSIZE )
                                rp=0;
+#ifndef SYNC_PAINT
                        pthread_mutex_unlock(&mutex);
+#endif
                        if (o.opcode==gOpcode::shutdown)
                                break;
                        else if (o.opcode==gOpcode::notify)
@@ -130,8 +126,8 @@ void *gRC::thread()
                        }
 #ifndef SYNC_PAINT
                        pthread_cond_wait(&cond, &mutex);
-#endif
                        pthread_mutex_unlock(&mutex);
+#endif
                }
        }
 #ifndef SYNC_PAINT