Commit 3205ec0f authored by Dylan Araps's avatar Dylan Araps

Image: Disable image mode if $DISPLAY is unset, closes #543

parent 17f3a7ac
...@@ -1770,10 +1770,18 @@ get_cols() { ...@@ -1770,10 +1770,18 @@ get_cols() {
get_image_backend() { get_image_backend() {
# This function determines which image backend to use # This function determines which image backend to use
# by checking for programs and etc. # by checking for programs and etc.
get_image_program
# Fallback to ascii mode if imagemagick isn't installed. # If the image source isn't 'ascii' or 'off'
type -p convert >/dev/null 2>&1 || image_backend="ascii" if [[ ! "${image_source}" =~ ^(off|ascii)$ ]]; then
# If X isn't running force ascii mode here.
[[ -z "$DISPLAY" ]] && image_source="ascii"
# Fallback to ascii mode if imagemagick isn't installed.
type -p convert >/dev/null 2>&1 || image_source="ascii"
fi
# Get the image program.
get_image_program
# If image source is ascii fallback to ascii # If image source is ascii fallback to ascii
if [[ "$image_source" == "ascii" ]]; then if [[ "$image_source" == "ascii" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment