From 76785ead4443e8432bcdefabc6f70cd244c8ddc9 Mon Sep 17 00:00:00 2001 From: Matej Date: Sun, 22 May 2022 17:51:01 +0200 Subject: [PATCH] Rework how we set the default OUTPUT variable display is never set and display_param_check is already checked when parsing options --- quickemu | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/quickemu b/quickemu index 4066a40..11b8f03 100755 --- a/quickemu +++ b/quickemu @@ -1611,16 +1611,14 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then disk_size="${disk}" fi + # Set the default OUTPUT if not provided by user if [ -z "${OUTPUT}" ]; then - # Braille support requires SDL. Override OUTPUT if braille was requested. - if [ -n "${BRAILLE}" ]; then - OUTPUT="sdl" - elif [ -z "${display}" ]; then - OUTPUT="sdl" - else - OUTPUT="${display}" - display_param_check - fi + OUTPUT="sdl" + fi + + # Braille support requires SDL. Override OUTPUT if braille was requested. + if [ -n "${BRAILLE}" ]; then + OUTPUT="sdl" fi if [ -z "${VIEWER}" ]; then