From: 0xACE <0xaced@gmail.com>
Date: Tue, 8 Sep 2020 11:17:10 +0000 (+0200)
Subject: preview-tabbed now kills lingering viewer
X-Git-Tag: v3.5~70^2
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=858794fd271b3714a8fe65c4dda3de913cce0e31;p=nnn.git

preview-tabbed now kills lingering viewer
---

diff --git a/plugins/preview-tabbed b/plugins/preview-tabbed
index 9fefee14..6a55058b 100755
--- a/plugins/preview-tabbed
+++ b/plugins/preview-tabbed
@@ -94,6 +94,12 @@ get_viewer_pid () {
         VIEWERPID="$(jobs -p %%)"
 }
 
+kill_viewer () {
+        if [ -n "$VIEWERPID" ] && jobs -p | grep "$VIEWERPID" ; then
+            kill "$VIEWERPID"
+        fi
+}
+
 previewer_loop () {
     unset -v NNN_FIFO
     # mute from now
@@ -123,9 +129,7 @@ previewer_loop () {
             continue
         fi
 
-        if [ -n "$VIEWERPID" ] && jobs -p | grep "$VIEWERPID" ; then
-            kill "$VIEWERPID"
-        fi
+        kill_viewer
 
         MIME="$(file -b --mime-type "$FILE")"
 
@@ -188,6 +192,7 @@ previewer_loop () {
         fi
     done
     kill "$TABBEDPID"
+    kill_viewer
 }
 
 if [ ! -r "$NNN_FIFO" ] ; then