refactor: remove VM_UP and use VM_PID to indicate if the VM is running

This commit is contained in:
Martin Wimpress 2024-05-11 12:14:46 +01:00 committed by Martin Wimpress
parent edfafdee5b
commit 1ae4af6244
1 changed files with 8 additions and 8 deletions

View File

@ -1324,7 +1324,7 @@ function vm_boot() {
SHELL_ARGS="${SHELL_ARGS//)/\\)}" SHELL_ARGS="${SHELL_ARGS//)/\\)}"
SHELL_ARGS="${SHELL_ARGS//Quickemu Project/\"Quickemu Project\"}" SHELL_ARGS="${SHELL_ARGS//Quickemu Project/\"Quickemu Project\"}"
if [ ${VM_UP} -eq 0 ]; then if [ -z "${VM_PID}" ]; then
# Enable grab-on-hover for SDL: https://github.com/quickemu-project/quickemu/issues/541 # Enable grab-on-hover for SDL: https://github.com/quickemu-project/quickemu/issues/541
case "${OUTPUT}" in case "${OUTPUT}" in
sdl) export SDL_MOUSE_FOCUS_CLICKTHROUGH=1;; sdl) export SDL_MOUSE_FOCUS_CLICKTHROUGH=1;;
@ -1938,13 +1938,13 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then
sound_card_param_check sound_card_param_check
# Check if vm is already run # Check if vm is already run
VM_PID=0 VM_PID=""
VM_UP=0
if [ -r "${VMDIR}/${VMNAME}.pid" ]; then if [ -r "${VMDIR}/${VMNAME}.pid" ]; then
VM_PID=$(head -c50 "${VMDIR}/${VMNAME}.pid") VM_PID=$(head -1 "${VMDIR}/${VMNAME}.pid")
if kill -0 "${VM_PID}" > /dev/null 2>&1; then if ! kill -0 "${VM_PID}" > /dev/null 2>&1; then
echo "VM already started!" # VM is not running, cleaning up.
VM_UP=1 VM_PID=""
rm -f "${VMDIR}/${VMNAME}.pid"
fi fi
fi fi
@ -2017,7 +2017,7 @@ if [ ${SHORTCUT} -eq 1 ]; then
exit exit
fi fi
if [ ${VM_UP} -eq 0 ]; then if [ -z "${VM_PID}" ]; then
#TODO: double quote the args array to prevent word splitting and this can be removed #TODO: double quote the args array to prevent word splitting and this can be removed
# Fix failing to start VM with spaces in the path # Fix failing to start VM with spaces in the path
# https://github.com/quickemu-project/quickemu/pull/875 # https://github.com/quickemu-project/quickemu/pull/875