Attempt to fix TDM failure whereby the custom X11 event handler is not used in certain circumstances

(cherry picked from commit b53726b1d5)
v3.5.13-sru
Timothy Pearson 11 years ago committed by Slávek Banko
parent 7f6dc78fa0
commit 7131fd81a2

@ -257,6 +257,7 @@ kg_main( const char *argv0 )
}
}
}
XSync( qt_xdisplay(), False );
XSetErrorHandler( (XErrorHandler)0 );
GreeterApp *app;
@ -413,6 +414,7 @@ kg_main( const char *argv0 )
dialog->move(primaryScreenPosition.x(), primaryScreenPosition.y());
#endif
}
XSync( qt_xdisplay(), False );
XSetErrorHandler( (XErrorHandler)0 );
} else {
if (trinity_desktop_lock_use_sak) {
@ -439,6 +441,7 @@ kg_main( const char *argv0 )
// This also prevents the user from being dropped to a console login if Xorg glitches or is buggy
XSetErrorHandler( ignoreXError );
rslt = dialog->exec();
XSync( qt_xdisplay(), False );
XSetErrorHandler( (XErrorHandler)0 );
Debug( "left event loop\n" );
@ -510,6 +513,7 @@ kg_main( const char *argv0 )
// This also prevents the user from being dropped to a console login if Xorg glitches or is buggy
XSetErrorHandler( ignoreXError );
XSetInputFocus( qt_xdisplay(), PointerRoot, PointerRoot, CurrentTime );
XSync( qt_xdisplay(), False );
XSetErrorHandler( (XErrorHandler)0 );
delete app;

Loading…
Cancel
Save