summaryrefslogtreecommitdiffstats
path: root/tdm/kfrontend
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-26 14:44:25 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-26 14:44:25 -0500
commite92e82b761f92754db582b5e98c0b3e788eba7d9 (patch)
tree2d433106b37e7de14c90d87a84c45c9b81a9ab96 /tdm/kfrontend
parent9187194ce10d7f7297404d0108976960fe463c26 (diff)
downloadtdebase-e92e82b761f92754db582b5e98c0b3e788eba7d9.tar.gz
tdebase-e92e82b761f92754db582b5e98c0b3e788eba7d9.zip
Fix a number of minor flaws in the lock dialog system
If SAK usage is enabled, override TDM theme
Diffstat (limited to 'tdm/kfrontend')
-rw-r--r--tdm/kfrontend/kgapp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index 727bddf8..3b075945 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -371,7 +371,7 @@ kg_main( const char *argv0 )
if ((cmd != G_GreetTimed && !_autoLoginAgain) ||
_autoLoginUser.isEmpty())
_autoLoginDelay = 0;
- if (_useTheme && !_theme.isEmpty()) {
+ if (_useTheme && !_theme.isEmpty() && !trinity_desktop_lock_use_sak) {
// 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 );