summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop/lock')
-rw-r--r--kdesktop/lock/lockprocess.cc2
-rw-r--r--kdesktop/lock/main.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index c0050d308..3c67ac06d 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -664,6 +664,7 @@ void LockProcess::startSecureDialog()
}
trinity_desktop_lock_in_sec_dlg = false;
if (ret == 0) {
+ trinity_desktop_lock_closing_windows = 1;
kapp->quit();
}
if (ret == 1) {
@@ -687,6 +688,7 @@ void LockProcess::startSecureDialog()
mBusy = false;
}
if (ret == 2) {
+ trinity_desktop_lock_closing_windows = 1;
if (system("ksysguard &") == -1) {
// Error handler to shut up gcc warnings
}
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 5853da17a..225d9c5b4 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -266,7 +266,7 @@ int main( int argc, char **argv )
bool rt;
bool sig = false;
- if( (!child && (args->isSet( "forcelock" )) || (signalled_forcelock == TRUE))) {
+ if( (((!child) && (args->isSet( "forcelock" ))) || (signalled_forcelock == TRUE))) {
rt = process.lock();
sig = true;
}