Browse Source

Merge pull request #725 from 0xACE/previewtab-no-one-left-behind

preview-tabbed now kills lingering viewer
master
Mischievous Meerkat GitHub 4 years ago
parent
commit
578912e75e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
  1. +8
    -3
      plugins/preview-tabbed

+ 8
- 3
plugins/preview-tabbed View File

@@ -94,6 +94,12 @@ get_viewer_pid () {
VIEWERPID="$(jobs -p %%)" VIEWERPID="$(jobs -p %%)"
} }


kill_viewer () {
if [ -n "$VIEWERPID" ] && jobs -p | grep "$VIEWERPID" ; then
kill "$VIEWERPID"
fi
}

previewer_loop () { previewer_loop () {
unset -v NNN_FIFO unset -v NNN_FIFO
# mute from now # mute from now
@@ -123,9 +129,7 @@ previewer_loop () {
continue continue
fi fi


if [ -n "$VIEWERPID" ] && jobs -p | grep "$VIEWERPID" ; then
kill "$VIEWERPID"
fi
kill_viewer


MIME="$(file -b --mime-type "$FILE")" MIME="$(file -b --mime-type "$FILE")"


@@ -188,6 +192,7 @@ previewer_loop () {
fi fi
done done
kill "$TABBEDPID" kill "$TABBEDPID"
kill_viewer
} }


if [ ! -r "$NNN_FIFO" ] ; then if [ ! -r "$NNN_FIFO" ] ; then


Loading…
Cancel
Save