Changeset 22985

Timestamp:

08/22/13 22:55:18 (11 years ago)

Author:

nit

Message:

[titan] fix rc standby

Location:

titan/titan

Files:

• rc.h (modified) (1 diff)
• standby.h (modified) (2 diffs)
• struct.h (modified) (1 diff)

titan/titan/rc.h

@@ -251 +251 @@
                         if(fromthread == 0) m_lock(&status.waitrcmutex, 24);
 
-                        if(status.rcowner != NULL && status.rcowner != owner)
-                        {
-                                usleep(100000);
-                                continue;
+                        if((status.rcowner != NULL && status.rcowner != owner) || (status.rcstandby != NULL && status.rcstandby != owner)) 
+                        {
+                                if(status.rcstandby == NULL || status.rcstandby != owner)
+                                {
+                                        usleep(100000);
+                                        continue;
+                                }
                         }
                 }

titan/titan/standby.h

@@ -58 +58 @@
 
         status.protecttime = 0;
-        status.rcowner = standbyscreen;
+        status.rcstandby = standbyscreen;
         
         setcecstandby(1);
@@ -113 +113 @@
         status.standby = 0;
         status.startmode = 1;
-        sleep(1);
-        status.rcowner = NULL;
+        status.rcstandby = NULL;
 
         if(status.aktservice->channel != NULL)

titan/titan/struct.h

@@ -1375 +1375 @@
         // if set to a skin (screenpointer) only this screen has rc
         struct skin* rcowner;
+        struct skin* rcstandby;
         // timerstuktur fuer autores
         struct stimerthread* restimer;