diff options
| author | Timothy Pearson <[email protected]> | 2012-04-27 13:26:04 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-03 03:27:16 +0200 |
| commit | 3870dbe675124cea8970e86a595827ed50c9acb4 (patch) | |
| tree | 4813abcff0939b26fb4d825dc48bc82c7d3d3636 /tsak | |
| parent | 33f1ecab8492e686c4bd736419ca1ae33e2c6eea (diff) | |
| download | tdebase-3870dbe675124cea8970e86a595827ed50c9acb4.tar.gz tdebase-3870dbe675124cea8970e86a595827ed50c9acb4.zip | |
Check for tsak presence on lock engage
Fix tsak not exiting on request
Clean up build warnings
(cherry picked from commit 22d0a673d7d6049d388847b476df1e5b6f3d6b70)
Diffstat (limited to 'tsak')
| -rw-r--r-- | tsak/main.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tsak/main.cpp b/tsak/main.cpp index 925decde4..9ac1b818b 100644 --- a/tsak/main.cpp +++ b/tsak/main.cpp @@ -108,7 +108,6 @@ void signal_callback_handler(int signum) { // Terminate program throw exit_exception(signum); - exit(signum); } /* termination handler */ @@ -395,7 +394,7 @@ int main (int argc, char *argv[]) struct input_event event; struct input_event revev; struct uinput_user_dev devinfo={{0},{0}}; - int devout[MAX_KEYBOARDS], rd, i, value, size = sizeof (struct input_event); + int devout[MAX_KEYBOARDS], rd, i, size = sizeof (struct input_event); char name[256] = "Unknown"; bool ctrl_down = false; bool alt_down = false; @@ -579,8 +578,6 @@ int main (int argc, char *argv[]) } } - value = ev[0].value; - if (ev[0].value == 0 && ev[0].type == 1) { // Read the key release event if (keycode[(ev[0].code)]) { if (strcmp(keycode[(ev[0].code)], "<control>") == 0) ctrl_down = false; @@ -713,7 +710,7 @@ int main (int argc, char *argv[]) } } catch(exit_exception& e) { - exit(e.c); + tsak_friendly_termination(); } return 6; |