diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-26 14:44:25 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:27:14 +0200 |
| commit | 6db29f067a886035aa5f1c3d59c28b2917d3038d (patch) | |
| tree | 094d8fac77cf136894737a6c8d3c0b23b54834ca /kdm/kfrontend/kgapp.cpp | |
| parent | 806153dfd6948a44d5a61e8c3fb6b6c21c00fe4a (diff) | |
| download | tdebase-6db29f067a886035aa5f1c3d59c28b2917d3038d.tar.gz tdebase-6db29f067a886035aa5f1c3d59c28b2917d3038d.zip | |
Fix a number of minor flaws in the lock dialog system
If SAK usage is enabled, override KDM theme
(cherry picked from commit e92e82b761f92754db582b5e98c0b3e788eba7d9)
Diffstat (limited to 'kdm/kfrontend/kgapp.cpp')
| -rw-r--r-- | kdm/kfrontend/kgapp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index 1999856de..8d4864669 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/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 ); |