]> Sergey Matveev's repositories - nnn.git/commitdiff
preview-tabbed now kills lingering viewer
author0xACE <0xaced@gmail.com>
Tue, 8 Sep 2020 11:17:10 +0000 (13:17 +0200)
committer0xACE <0xaced@gmail.com>
Tue, 8 Sep 2020 11:21:43 +0000 (13:21 +0200)
plugins/preview-tabbed

index 9fefee144448ac194657493344257928fb57d159..6a55058b7d6afd33e76072531e50c7c4ab059c98 100755 (executable)
@@ -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