1 files changed, 4 insertions, 0 deletions
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index 37c8130c1..259e2666b 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -518,7 +518,11 @@ kg_main( const char *argv0 )
 	UnsecureDisplay( dpy );
 	restore_modifiers();
 
+	// Qt4 has a nasty habit of generating BadWindow errors in normal operation, so we simply ignore them
+	// 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 );
+	XSetErrorHandler( (XErrorHandler)0 );
 
 	delete app;
 }