From c37d8d930c97e63cca85114e057c0f30a48cad0a Mon Sep 17 00:00:00 2001
From: nathan <nathan@pacificao.com>
Date: Tue, 19 May 2026 11:48:39 -0700
Subject: [PATCH] Fix Windows visual QA helper checks

---
 Scripts/RunWindowsGpuStartupVisualCheck.bat | 35 +++++++++------------
 Scripts/RunWindowsInvestorVisualQACheck.bat | 35 +++++++++------------
 2 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/Scripts/RunWindowsGpuStartupVisualCheck.bat b/Scripts/RunWindowsGpuStartupVisualCheck.bat
index 0cab4d9..5ed9329 100644
--- a/Scripts/RunWindowsGpuStartupVisualCheck.bat
+++ b/Scripts/RunWindowsGpuStartupVisualCheck.bat
@@ -6,9 +6,21 @@ set "PACKAGE_DIR=%PROJECT_DIR%\Builds\WindowsDevelopment"
 set "DEMO_EXE=%PACKAGE_DIR%\AgrarianGame.exe"
 set "CAPTURE_ROOT=%PROJECT_DIR%\Saved\VisualQA\GpuStartup"
 
-if /I "%~1"=="--check-tools" goto CHECK_TOOLS
+if not exist "%DEMO_EXE%" (
+	echo ERROR: Packaged demo executable not found: "%DEMO_EXE%"
+	exit /b 2
+)
 
-call :CHECK_COMMON || exit /b %ERRORLEVEL%
+sc query SunshineService | find /I "RUNNING" >nul 2>nul
+if errorlevel 1 (
+	echo ERROR: SunshineService is not running. Start Sunshine before the GPU visual test.
+	exit /b 3
+)
+
+if /I "%~1"=="--check-tools" (
+	echo READY: packaged demo exists and SunshineService is running.
+	exit /b 0
+)
 
 if not exist "%CAPTURE_ROOT%" mkdir "%CAPTURE_ROOT%" >nul 2>nul
 
@@ -39,22 +51,3 @@ echo Create visual-startup-check.txt in the capture folder with package path,
 echo launcher used, capture method, tester, pass/fail result, and notes.
 echo.
 exit /b 0
-
-:CHECK_TOOLS
-call :CHECK_COMMON || exit /b %ERRORLEVEL%
-echo READY: packaged demo exists and SunshineService is running.
-exit /b 0
-
-:CHECK_COMMON
-if not exist "%DEMO_EXE%" (
-	echo ERROR: Packaged demo executable not found: "%DEMO_EXE%"
-	exit /b 2
-)
-
-sc query SunshineService | find /I "RUNNING" >nul 2>nul
-if errorlevel 1 (
-	echo ERROR: SunshineService is not running. Start Sunshine before the GPU visual test.
-	exit /b 3
-)
-
-exit /b 0
diff --git a/Scripts/RunWindowsInvestorVisualQACheck.bat b/Scripts/RunWindowsInvestorVisualQACheck.bat
index 1d987c4..dd4f14e 100644
--- a/Scripts/RunWindowsInvestorVisualQACheck.bat
+++ b/Scripts/RunWindowsInvestorVisualQACheck.bat
@@ -6,9 +6,21 @@ set "PACKAGE_DIR=%PROJECT_DIR%\Builds\WindowsDevelopment"
 set "DEMO_EXE=%PACKAGE_DIR%\AgrarianGame.exe"
 set "CAPTURE_ROOT=%PROJECT_DIR%\Saved\VisualQA\InvestorDemo"
 
-if /I "%~1"=="--check-tools" goto CHECK_TOOLS
+if not exist "%DEMO_EXE%" (
+	echo ERROR: Packaged demo executable not found: "%DEMO_EXE%"
+	exit /b 2
+)
 
-call :CHECK_COMMON || exit /b %ERRORLEVEL%
+sc query SunshineService | find /I "RUNNING" >nul 2>nul
+if errorlevel 1 (
+	echo ERROR: SunshineService is not running. Start Sunshine before the investor visual QA capture.
+	exit /b 3
+)
+
+if /I "%~1"=="--check-tools" (
+	echo READY: packaged demo exists and SunshineService is running.
+	exit /b 0
+)
 
 if not exist "%CAPTURE_ROOT%" mkdir "%CAPTURE_ROOT%" >nul 2>nul
 
@@ -39,22 +51,3 @@ echo version label, rendering preset, capture method, tester, pass/fail result,
 echo visible defects, and investor-viewing decision.
 echo.
 exit /b 0
-
-:CHECK_TOOLS
-call :CHECK_COMMON || exit /b %ERRORLEVEL%
-echo READY: packaged demo exists and SunshineService is running.
-exit /b 0
-
-:CHECK_COMMON
-if not exist "%DEMO_EXE%" (
-	echo ERROR: Packaged demo executable not found: "%DEMO_EXE%"
-	exit /b 2
-)
-
-sc query SunshineService | find /I "RUNNING" >nul 2>nul
-if errorlevel 1 (
-	echo ERROR: SunshineService is not running. Start Sunshine before the investor visual QA capture.
-	exit /b 3
-)
-
-exit /b 0