From b3edd83e0a5c1f32509706ae2e33d6a73f29b903 Mon Sep 17 00:00:00 2001 From: MacDue Date: Tue, 14 Mar 2023 19:57:51 +0000 Subject: [PATCH] LibGUI: Allow passing working directory to spawn_or_show_error() --- Userland/Libraries/LibGUI/Process.cpp | 16 ++++++++-------- Userland/Libraries/LibGUI/Process.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Userland/Libraries/LibGUI/Process.cpp b/Userland/Libraries/LibGUI/Process.cpp index 269a6a3a9b..3029fb2251 100644 --- a/Userland/Libraries/LibGUI/Process.cpp +++ b/Userland/Libraries/LibGUI/Process.cpp @@ -9,28 +9,28 @@ #include template -void spawn_or_show_error(GUI::Window* parent_window, StringView path, ReadonlySpan arguments) +void spawn_or_show_error(GUI::Window* parent_window, StringView path, ReadonlySpan arguments, StringView working_directory) { - auto spawn_result = Core::Process::spawn(path, arguments); + auto spawn_result = Core::Process::spawn(path, arguments, working_directory); if (spawn_result.is_error()) GUI::MessageBox::show_error(parent_window, DeprecatedString::formatted("Failed to spawn {}: {}", path, spawn_result.error())); } namespace GUI { -void Process::spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments) +void Process::spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments, StringView working_directory) { - ::spawn_or_show_error(parent_window, path, arguments); + ::spawn_or_show_error(parent_window, path, arguments, working_directory); } -void Process::spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments) +void Process::spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments, StringView working_directory) { - ::spawn_or_show_error(parent_window, path, arguments); + ::spawn_or_show_error(parent_window, path, arguments, working_directory); } -void Process::spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments) +void Process::spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments, StringView working_directory) { - ::spawn_or_show_error(parent_window, path, arguments); + ::spawn_or_show_error(parent_window, path, arguments, working_directory); } } diff --git a/Userland/Libraries/LibGUI/Process.h b/Userland/Libraries/LibGUI/Process.h index 8ba1aa8eef..44a5969077 100644 --- a/Userland/Libraries/LibGUI/Process.h +++ b/Userland/Libraries/LibGUI/Process.h @@ -12,9 +12,9 @@ namespace GUI { struct Process { - static void spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments); - static void spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments); - static void spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments = {}); + static void spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments, StringView working_directory = {}); + static void spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments, StringView working_directory = {}); + static void spawn_or_show_error(Window* parent_window, StringView path, ReadonlySpan arguments = {}, StringView working_directory = {}); }; }