Revert "Change name of flatpak systemd service"

This reverts commit b865f5cae3c503be65ce55b58fae09589cff3b0f.

2 files changed, 37 insertions, 20 deletions

diff --git a/src/Process.cpp b/src/Process.cpp
index 2a704de..347c485 100644
--- a/src/Process.cpp
+++ b/src/Process.cpp
@@ -31,6 +31,15 @@ namespace gsr {
         return true;
     }
 
+    static int count_num_args(const char **args) {
+        int num_args = 0;
+        while(*args) {
+            ++num_args;
+            ++args;
+        }
+        return num_args;
+    }
+
     bool exec_program_daemonized(const char **args) {
         /* 1 argument */
         if(args[0] == nullptr)
@@ -143,6 +152,30 @@ namespace gsr {
         return exit_status;
     }
 
+    int exec_program_on_host_get_stdout(const char **args, std::string &result) {
+        if(count_num_args(args) > 64 - 3) {
+            fprintf(stderr, "Error: too many arguments when trying to launch \"%s\"\n", args[0]);
+            return -1;
+        }
+
+        const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
+        if(inside_flatpak) {
+            // Assumes programs wont need more than 64 - 3 args
+            const char *modified_args[64] = { "flatpak-spawn", "--host", "--" };
+            for(int i = 3; i < 64; ++i) {
+                const char *arg = args[i - 3];
+                if(!arg) {
+                    modified_args[i] = nullptr;
+                    break;
+                }
+                modified_args[i] = arg;
+            }
+            return exec_program_get_stdout(modified_args, result);
+        } else {
+            return exec_program_get_stdout(args, result);
+        }
+    }
+
     // |output_buffer| should be at least PATH_MAX in size
     bool read_cmdline_arg0(const char *filepath, char *output_buffer, int output_buffer_size) {
         output_buffer[0] = '\0';
diff --git a/src/gui/GlobalSettingsPage.cpp b/src/gui/GlobalSettingsPage.cpp
index 04c2874..7e79c16 100644
--- a/src/gui/GlobalSettingsPage.cpp
+++ b/src/gui/GlobalSettingsPage.cpp
@@ -75,17 +75,9 @@ namespace gsr {
             else
                 return;
 
+            const char *args[] = { "systemctl", enable ? "enable" : "disable", "--user", "gpu-screen-recorder-ui", nullptr };
             std::string stdout_str;
-            int exit_status = 0;
-            const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
-            if(inside_flatpak) {
-                const char *args[] = { "flatpak-spawn", "--host", "--", "systemctl", enable ? "enable" : "disable", "--user", "gpu-screen-recorder-ui-flatpak", nullptr };
-                exit_status = exec_program_get_stdout(args, stdout_str);
-            } else {
-                const char *args[] = { "systemctl", enable ? "enable" : "disable", "--user", "gpu-screen-recorder-ui", nullptr };
-                exit_status = exec_program_get_stdout(args, stdout_str);
-            }
-
+            const int exit_status = exec_program_on_host_get_stdout(args, stdout_str);
             if(on_startup_changed)
                 on_startup_changed(enable, exit_status);
         };
@@ -115,17 +107,9 @@ namespace gsr {
         else
             tint_color_radio_button_ptr->set_selected_item(config.main_config.tint_color);
 
+        const char *args[] = { "systemctl", "is-enabled", "--quiet", "--user", "gpu-screen-recorder-ui", nullptr };
         std::string stdout_str;
-        int exit_status = 0;
-        const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
-        if(inside_flatpak) {
-            const char *args[] = { "flatpak-spawn", "--host", "--", "systemctl", "is-enabled", "--quiet", "--user", "gpu-screen-recorder-ui", nullptr };
-            exit_status = exec_program_get_stdout(args, stdout_str);
-        } else {
-            const char *args[] = { "systemctl", "is-enabled", "--quiet", "--user", "gpu-screen-recorder-ui", nullptr };
-            exit_status = exec_program_get_stdout(args, stdout_str);
-        }
-
+        const int exit_status = exec_program_on_host_get_stdout(args, stdout_str);
         startup_radio_button_ptr->set_selected_item(exit_status == 0 ? "start_on_system_startup" : "dont_start_on_system_startup", false, false);
     }