Rework how we set the default OUTPUT
variable display is never set and display_param_check is already checked when parsing options
This commit is contained in:
parent
0ba584ab1b
commit
76785ead44
10
quickemu
10
quickemu
@ -1611,16 +1611,14 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then
|
|||||||
disk_size="${disk}"
|
disk_size="${disk}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Set the default OUTPUT if not provided by user
|
||||||
if [ -z "${OUTPUT}" ]; then
|
if [ -z "${OUTPUT}" ]; then
|
||||||
|
OUTPUT="sdl"
|
||||||
|
fi
|
||||||
|
|
||||||
# Braille support requires SDL. Override OUTPUT if braille was requested.
|
# Braille support requires SDL. Override OUTPUT if braille was requested.
|
||||||
if [ -n "${BRAILLE}" ]; then
|
if [ -n "${BRAILLE}" ]; then
|
||||||
OUTPUT="sdl"
|
OUTPUT="sdl"
|
||||||
elif [ -z "${display}" ]; then
|
|
||||||
OUTPUT="sdl"
|
|
||||||
else
|
|
||||||
OUTPUT="${display}"
|
|
||||||
display_param_check
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "${VIEWER}" ]; then
|
if [ -z "${VIEWER}" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user