diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-22 01:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-22 01:17:21 -0600 |
| commit | 5f8d730703882e1335305a2c43a378f0c4b96e8e (patch) | |
| tree | f2a234295414c6342a91bb74051dff12f9fe0438 | |
| parent | b81e43465b14836b17e4fe2dea91c78a2bdd29b3 (diff) | |
| download | tdebase-5f8d730703882e1335305a2c43a378f0c4b96e8e.tar.gz tdebase-5f8d730703882e1335305a2c43a378f0c4b96e8e.zip | |
Fix desktop lock
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 2 | ||||
| -rw-r--r-- | kdesktop/lock/main.cc | 4 | ||||
| -rw-r--r-- | kdesktop/lockeng.cc | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 2588bbfea..5acc96e23 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -630,6 +630,8 @@ void LockProcess::startSecureDialog() return; } + setGeometry(0, 0, mRootWidth, mRootHeight); + int ret; SecureDlg inDlg( this ); inDlg.setRetInt(&ret); diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 2711c36c5..c0b8e2480 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -181,14 +181,14 @@ int main( int argc, char **argv ) rt = process.runSecureDialog(); } else { - return 1; + return 0; } } else { rt = process.defaultSave(); } if (!rt) { - return 1; + return 0; } if( sig ) diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc index fb0f75447..5307c5c5e 100644 --- a/kdesktop/lockeng.cc +++ b/kdesktop/lockeng.cc @@ -372,6 +372,7 @@ printf("Lock process exited\n\r"); fflush(stdout); } if (mTerminationRequested == true) { abnormalExit = false; + mTerminationRequested = false; } if (abnormalExit == true) { // PROBABLE HACKING ATTEMPT DETECTED |