From e92e82b761f92754db582b5e98c0b3e788eba7d9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 26 Apr 2012 14:44:25 -0500 Subject: Fix a number of minor flaws in the lock dialog system If SAK usage is enabled, override TDM theme --- tdm/kfrontend/kgapp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdm/kfrontend') diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index 727bddf8d..3b075945f 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 ); -- cgit v1.2.3