diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-09 02:31:32 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-09 02:31:32 +0000 |
| commit | d6d1056a7fa918459ad7daa9cb268d405b08da78 (patch) | |
| tree | d3b7d91a778e3b4106a1b9b0969873b819e4e600 | |
| parent | 39dc2df1abb736f0e4053e287a343e1a7001d1c4 (diff) | |
| download | tdebase-d6d1056a7fa918459ad7daa9cb268d405b08da78.tar.gz tdebase-d6d1056a7fa918459ad7daa9cb268d405b08da78.zip | |
Fix abort on X error in kdm
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1227443 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kdm/kfrontend/kgapp.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index 8518ce46d..2e40d07ef 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -228,13 +228,17 @@ kg_main( const char *argv0 ) _autoLoginUser.isEmpty()) _autoLoginDelay = 0; if (_useTheme && !_theme.isEmpty()) { + // 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 ); KThemedGreeter *tgrt; dialog = tgrt = new KThemedGreeter; - kdDebug() << timestamp() << " themed" << endl; + kdDebug() << timestamp() << " themed" << endl; if (!tgrt->isOK()) { delete tgrt; dialog = new KStdGreeter; } + XSetErrorHandler( (XErrorHandler)0 ); } else dialog = new KStdGreeter; if (*_preloader) { |