summaryrefslogtreecommitdiffstats
path: root/tsak
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-27 13:26:04 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-27 13:26:04 -0500
commit22d0a673d7d6049d388847b476df1e5b6f3d6b70 (patch)
treeb6fc0fe18603cf23bfbcf480a169081b11a99beb /tsak
parente899b7beb6b0f2db8c08dfdc14c29efb99046086 (diff)
downloadtdebase-22d0a673d7d6049d388847b476df1e5b6f3d6b70.tar.gz
tdebase-22d0a673d7d6049d388847b476df1e5b6f3d6b70.zip
Check for tsak presence on lock engage
Fix tsak not exiting on request Clean up build warnings
Diffstat (limited to 'tsak')
-rw-r--r--tsak/main.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/tsak/main.cpp b/tsak/main.cpp
index f0fe3b1a..38ecbcf0 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;