mirror of
https://github.com/jarun/nnn.git
synced 2024-11-17 16:39:14 +00:00
Merge pull request #725 from 0xACE/previewtab-no-one-left-behind
preview-tabbed now kills lingering viewer
This commit is contained in:
commit
578912e75e
|
@ -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_viewer
|
||||||
kill "$VIEWERPID"
|
|
||||||
fi
|
|
||||||
|
|
||||||
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…
Reference in a new issue