1 files changed, 16 insertions, 0 deletions
diff --git a/cli.c b/cli.c
index 2dbace5..5fc3162 100644
--- a/cli.c
+++ b/cli.c
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <pthread.h>
+#include <signal.h>
 
 #include <getopt.h>
 
@@ -284,6 +285,14 @@ argv[0]);
     exit(0);
 }
 
+static int StopFlag = 0;
+
+static void signal_exit_handler(int signo) { 
+    if (++StopFlag > 2)
+	exit(-1);
+}
+
+
 void Error(const char *format, ...) {
     va_list ap;
     
@@ -1314,6 +1323,11 @@ void *Monitor(void *user) {
     }
     
     while (ctx->run_flag) {
+	if (StopFlag) {
+	    pcilib_stop(ctx->handle, PCILIB_EVENT_FLAG_STOP_ONLY);
+	    break;
+	}
+	
 	if (timeout) {
 	    if (pcilib_calc_time_to_deadline(&deadline) == 0) {
 		memcpy(&deadline, (struct timeval*)&ctx->last_frame, sizeof(struct timeval));
@@ -2501,6 +2515,8 @@ int main(int argc, char **argv) {
 	}
     }
 
+    signal(SIGINT, signal_exit_handler);
+
     if (output) {
 	ofile = fopen(output, "a+");
 	if (!ofile) {