From 3df6cf510a9890b8d20b8d6b26e0924e02bd2347 Mon Sep 17 00:00:00 2001
From: Peter Repukat <orly.alia5@gmail.com>
Date: Sun, 16 Oct 2022 12:37:14 +0200
Subject: [PATCH] AppLauncher: Fix Win32 launch args

---
 GlosSITarget/AppLauncher.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/GlosSITarget/AppLauncher.cpp b/GlosSITarget/AppLauncher.cpp
index 71dae27..8a07887 100644
--- a/GlosSITarget/AppLauncher.cpp
+++ b/GlosSITarget/AppLauncher.cpp
@@ -287,10 +287,16 @@ void AppLauncher::launchWin32App(const std::wstring& path, const std::wstring& a
     // } else {
     //     launch_dir = m[0];
     // }
-    std::wstring args_cpy(args);
+    std::wstring args_cpy(
+        args.empty()
+        ? L""
+            : ((native_seps_path.find(L" ") != std::wstring::npos
+                    ? L"\"" + native_seps_path + L"\""
+                    : native_seps_path) + L" " + args)
+    );
     spdlog::debug(L"Launching Win32App app \"{}\"; args \"{}\"", native_seps_path, args_cpy);
     if (CreateProcessW(native_seps_path.data(),
-                       args_cpy.data(),
+                       args_cpy.empty() ? nullptr : args_cpy.data(),
                        nullptr,
                        nullptr,
                        watchdog ? FALSE : TRUE,