Eliminate wcsv2strv

1 files changed, 4 insertions, 2 deletions

diff --git a/exec.cpp b/exec.cpp
index 4b9e1f37..62523a8c 100644
--- a/exec.cpp
+++ b/exec.cpp
@@ -361,12 +361,14 @@ static void launch_process_nofork(process_t *p)
     ASSERT_IS_MAIN_THREAD();
     ASSERT_IS_NOT_FORKED_CHILD();
 
-    char **argv = wcsv2strv(p->get_argv());
+    null_terminated_array_t<char> argv_array;
+    convert_wide_array_to_narrow(p->get_argv_array(), &argv_array);
+
     const char *const *envv = env_export_arr(false);
     char *actual_cmd = wcs2str(p->actual_cmd.c_str());
 
     /* Bounce to launch_process. This never returns. */
-    safe_launch_process(p, actual_cmd, argv, envv);
+    safe_launch_process(p, actual_cmd, argv_array.get(), envv);
 }