fix: rebase and more robust runner->run

games-on-whales · Oct 7, 2024 · d914a8b · d914a8b
1 parent 8198fe0
commit d914a8b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/src/moonlight-server/events/events.hpp b/src/moonlight-server/events/events.hpp
@@ -48,7 +48,7 @@ struct Runner {
 
   virtual void run(std::size_t session_id,
                    std::string_view app_state_folder,
-                   const std::shared_ptr<events::devices_atom_queue> &plugged_devices_queue,
+                   std::shared_ptr<events::devices_atom_queue> plugged_devices_queue,
                    const immer::array<std::string> &virtual_inputs,
                    const immer::array<std::pair<std::string, std::string>> &paths,
                    const immer::map<std::string, std::string> &env_variables,

diff --git a/src/moonlight-server/runners/child_session.hpp b/src/moonlight-server/runners/child_session.hpp
@@ -19,7 +19,7 @@ class RunChildSession : public events::Runner {
 
   void run(std::size_t session_id,
            std::string_view app_state_folder,
-           const std::shared_ptr<events::devices_atom_queue> &plugged_devices_queue,
+           std::shared_ptr<events::devices_atom_queue> plugged_devices_queue,
            const immer::array<std::string> &virtual_inputs,
            const immer::array<std::pair<std::string, std::string>> &paths,
            const immer::map<std::string, std::string> &env_variables,

diff --git a/src/moonlight-server/runners/docker.cpp b/src/moonlight-server/runners/docker.cpp
@@ -15,7 +15,7 @@ void create_udev_hw_files(std::filesystem::path base_hw_db_path,
 
 void RunDocker::run(std::size_t session_id,
                     std::string_view app_state_folder,
-                    const std::shared_ptr<events::devices_atom_queue> &plugged_devices_queue,
+                    std::shared_ptr<events::devices_atom_queue> plugged_devices_queue,
                     const immer::array<std::string> &virtual_inputs,
                     const immer::array<std::pair<std::string, std::string>> &paths,
                     const immer::map<std::string, std::string> &env_variables,

diff --git a/src/moonlight-server/runners/docker.hpp b/src/moonlight-server/runners/docker.hpp
@@ -86,7 +86,7 @@ class RunDocker : public events::Runner {
 
   void run(std::size_t session_id,
            std::string_view app_state_folder,
-           const std::shared_ptr<events::devices_atom_queue> &plugged_devices_queue,
+           std::shared_ptr<events::devices_atom_queue> plugged_devices_queue,
            const immer::array<std::string> &virtual_inputs,
            const immer::array<std::pair<std::string, std::string>> &paths,
            const immer::map<std::string, std::string> &env_variables,

diff --git a/src/moonlight-server/runners/process.cpp b/src/moonlight-server/runners/process.cpp
@@ -12,7 +12,7 @@ using namespace wolf::core::events;
 
 void RunProcess::run(std::size_t session_id,
                      std::string_view app_state_folder,
-                     const std::shared_ptr<events::devices_atom_queue> &plugged_devices_queue,
+                     std::shared_ptr<events::devices_atom_queue> plugged_devices_queue,
                      const immer::array<std::string> &virtual_inputs,
                      const immer::array<std::pair<std::string, std::string>> &paths,
                      const immer::map<std::string, std::string> &env_variables,

diff --git a/src/moonlight-server/runners/process.hpp b/src/moonlight-server/runners/process.hpp
@@ -19,7 +19,7 @@ class RunProcess : public events::Runner {
 
   void run(std::size_t session_id,
            std::string_view app_state_folder,
-           const std::shared_ptr<events::devices_atom_queue> &plugged_devices_queue,
+           std::shared_ptr<events::devices_atom_queue> plugged_devices_queue,
            const immer::array<std::string> &virtual_inputs,
            const immer::array<std::pair<std::string, std::string>> &paths,
            const immer::map<std::string, std::string> &env_variables,

diff --git a/src/moonlight-server/wolf.cpp b/src/moonlight-server/wolf.cpp
@@ -317,15 +317,19 @@ auto setup_sessions_handlers(const immer::box<state::AppState> &app_state,
           }
 
           auto devices_q = plugged_devices_queue->load()->find(session->session_id);
-
-          /* Finally run the app, this will stop here until over */
-          run_session->runner->run(session->session_id,
-                                   session->app_state_folder,
-                                   *devices_q,
-                                   all_devices.persistent(),
-                                   mounted_paths.persistent(),
-                                   full_env.persistent(),
-                                   render_node);
+          if (!devices_q) {
+            logs::log(logs::warning, "No devices queue found for session {}", session->session_id);
+            return;
+          } else {
+            /* Finally run the app, this will stop here until over */
+            run_session->runner->run(session->session_id,
+                                     session->app_state_folder,
+                                     *devices_q,
+                                     all_devices.persistent(),
+                                     mounted_paths.persistent(),
+                                     full_env.persistent(),
+                                     render_node);
+          }
 
           if (run_session->stop_stream_when_over) {
             /* App exited, cleanup */