From: Johannes Weißl <jargon@molb.org>
Date: Fri, 3 Dec 2010 05:08:10 +0000 (+0100)
Subject: bugfix: reopen tty if $STY is empty
X-Git-Url: https://projects.mako.cc/source/muttjump/commitdiff_plain/6f223392238d65b7156723afed21b71f009cf4ac?ds=sidebyside

bugfix: reopen tty if $STY is empty
---

diff --git a/muttjump b/muttjump
index b5736d5..4a1fd93 100755
--- a/muttjump
+++ b/muttjump
@@ -80,6 +80,15 @@ END
     exit 1
 }
 
+function reopen_tty () {
+    # Close message-stdin and open terminal-stdin instead.
+    # mutt behaves different if STDIN is no terminal
+    # TODO: Find cleaner solution (e.g. mutt command-line argument?)
+    exec 0<&-
+    term="/dev/$(ps -p$$ -otty=)"
+    exec < $term
+}
+
 
 # Check command-line arguments and STDIN
 search_header="Message-ID"
@@ -191,17 +200,16 @@ if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
     screen_opts=()
     if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
-        [ -n "$STY" ] && screen_opts=("-X" "screen")
+        if [ -n "$STY" ] ; then
+            screen_opts=("-X" "screen")
+        else
+            reopen_tty
+        fi
         screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
         screen_opts=("${screen_opts[@]}" "-t" "$screen_window_name")
     else
         SCREEN=""
-        # Close message-stdin and open terminal-stdin instead.
-        # mutt behaves different if STDIN is no terminal
-        # TODO: Find cleaner solution (e.g. mutt command-line argument?)
-        exec 0<&-
-        term="/dev/$(ps -p$$ -otty=)"
-        exec < $term
+        reopen_tty
     fi
 
     # start mutt, open original folder and jump to the original message