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

pull/2/head
Timothy Pearson 12 years ago
parent 63989b0b22
commit b53726b1d5

@ -275,6 +275,7 @@ kg_main( const char *argv0 )
}
}
}
XSync( tqt_xdisplay(), False );
XSetErrorHandler( (XErrorHandler)0 );
GreeterApp *app;
@ -441,6 +442,7 @@ kg_main( const char *argv0 )
dialog->move(primaryScreenPosition.x(), primaryScreenPosition.y());
#endif
}
XSync( tqt_xdisplay(), False );
XSetErrorHandler( (XErrorHandler)0 );
} else {
if (trinity_desktop_lock_use_sak) {
@ -467,6 +469,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( tqt_xdisplay(), False );
XSetErrorHandler( (XErrorHandler)0 );
Debug( "left event loop\n" );
@ -538,6 +541,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( tqt_xdisplay(), PointerRoot, PointerRoot, CurrentTime );
XSync( tqt_xdisplay(), False );
XSetErrorHandler( (XErrorHandler)0 );
delete app;

Loading…
Cancel
Save