Merge branch 'master' into bacardi55

2010-12-19 13:14:30 +01:00 · 2010-12-19 13:14:30 +01:00 · b4fb75806a
commit b4fb75806a
parent 3f461810d2 dbe7588c0a
1 changed files with 1 additions and 0 deletions
--- a/src/wmfs.c
+++ b/src/wmfs.c
@ -253,6 +253,7 @@ void
 uicb_reload(uicb_t cmd)
 {
     (void)cmd;
+     signal(SIGALRM, SIG_IGN);
     quit();

     for(; argv_global[0] && argv_global[0] == ' '; ++argv_global);