Merge remote-tracking branch 'upstream/master' into exit-title

2015-01-03 12:41:42 -06:00
parent 832074de4a f5e5315125
commit 30610f7c48
6 changed files with 52 additions and 15 deletions
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -254,6 +254,8 @@ _init(const int disable_tls, char *log_level)
    setlocale(LC_ALL, "");
    // ignore SIGPIPE
    signal(SIGPIPE, SIG_IGN);
+    signal(SIGINT, SIG_IGN);
+    signal(SIGTSTP, SIG_IGN);
    _create_directories();
    log_level_t prof_log_level = log_level_from_string(log_level);
    prefs_load();