Ticket #6162: xsyncfix.diff

mythtv/libs/libmyth/screensaver-x11.cpp

@@ -101 +101 @@
             m_dpmsdeactivated = true;
             DPMSDisable(qt_xdisplay());
             VERBOSE(VB_GENERAL, "DPMS Deactivated ");
+            XSync(qt_xdisplay(), FALSE);
         }
     }
 
@@ -111 +112 @@
             m_dpmsdeactivated = false;
             DPMSEnable(qt_xdisplay());
             VERBOSE(VB_GENERAL, "DPMS Reactivated.");
+            XSync(qt_xdisplay(), FALSE);
         }
     }
 
@@ -130 +132 @@
         {
             XSetScreenSaver(qt_xdisplay(), m_state.timeout, m_state.interval,
                             m_state.preferblank, m_state.allowexposure);
+            XSync(qt_xdisplay(), FALSE);
             m_state.saved = false;
         }
     }
@@ -197 +200 @@
     XResetScreenSaver(qt_xdisplay());
 
     XSetScreenSaver(qt_xdisplay(), 0, 0, 0, 0);
+    XSync(qt_xdisplay(), FALSE);
 
     d->DisableDPMS();
 
@@ -211 +215 @@
 
     // One must reset after the restore
     XResetScreenSaver(qt_xdisplay());
+    XSync(qt_xdisplay(), FALSE);
 
     if (d->IsScreenSaverRunning())
         d->StopTimer();
@@ -225 +230 @@
     if (Asleep())
     {
         DPMSForceLevel(qt_xdisplay(), DPMSModeOn);
-        // Calling XSync is necessary for the case when Myth executes
-        // another application before the event loop regains control
-        XSync(qt_xdisplay(), false);
     }
+    XSync(qt_xdisplay(), FALSE);
 }
 
 bool ScreenSaverX11::Asleep(void)