Merge lp:~niclasl/pantheon-terminal/fix-zsh-hang into lp:~elementary-apps/pantheon-terminal/trunk

[Niclas Lockner]

Also send SIGHUP because zsh is ignoring SIGTERM.

Change signal to SIGHUP when terminating shell processes. ZSH ignores SIGTERM when it's running in an interactive session.

[Raphael Isemann (teemperor)]

We should change it to send both SIGTERM and SIGHUP.

review: Needs Fixing

[lp:~niclasl/pantheon-terminal/fix-zsh-hang]

599. By Niclas Lockner on 2014-08-08

Use SIGTERM as well as SUGHUP

[Raphael Isemann (teemperor)]

Fixes the problem and sending two signals seems fine to me.

review: Approve (functionality, code-style)

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2014-08-07 14:01:14 +0000
+++ src/TerminalWidget.vala	2014-08-08 07:12:09 +0000
@@ -245,6 +245,7 @@
 
             /* Check if the shell process is still alive by sending 0 signals */
             while (Posix.kill (this.child_pid, 0) == 0) {
+                Posix.kill (this.child_pid, Posix.SIGHUP);
                 Posix.kill (this.child_pid, Posix.SIGTERM);
                 Thread.usleep (100);
             }
@@ -421,4 +422,4 @@
             }
         }
     }
-}
+}
 \ No newline at end of file