1 files changed, 38 insertions, 12 deletions

diff --git a/src/Overlay.cpp b/src/Overlay.cpp
index 91f20db..70278ee 100644
--- a/src/Overlay.cpp
+++ b/src/Overlay.cpp
@@ -12,10 +12,10 @@
 #include "../include/gui/Utils.hpp"
 #include "../include/gui/PageStack.hpp"
 #include "../include/WindowUtils.hpp"
-#include "../include/GlobalHotkeys.hpp"
-#include "../include/GlobalHotkeysLinux.hpp"
-#include "../include/CursorTrackerX11.hpp"
-#include "../include/CursorTrackerWayland.hpp"
+#include "../include/GlobalHotkeys/GlobalHotkeys.hpp"
+#include "../include/GlobalHotkeys/GlobalHotkeysLinux.hpp"
+#include "../include/CursorTracker/CursorTrackerX11.hpp"
+#include "../include/CursorTracker/CursorTrackerWayland.hpp"
 
 #include <string.h>
 #include <assert.h>
@@ -207,24 +207,21 @@ namespace gsr {
         return false;
     }*/
 
-    // Returns the first monitor if not found. Assumes there is at least one monitor connected.
     static const Monitor* find_monitor_at_position(const std::vector<Monitor> &monitors, mgl::vec2i pos) {
         assert(!monitors.empty());
         for(const Monitor &monitor : monitors) {
             if(mgl::IntRect(monitor.position, monitor.size).contains(pos))
                 return &monitor;
         }
-        return &monitors.front();
+        return nullptr;
     }
 
-    // Returns the first monitor if not found. Assumes there is at least one monitor connected.
     static const Monitor* find_monitor_by_name(const std::vector<Monitor> &monitors, const std::string &name) {
-        assert(!monitors.empty());
         for(const Monitor &monitor : monitors) {
             if(monitor.name == name)
                 return &monitor;
         }
-        return &monitors.front();
+        return nullptr;
     }
 
     static std::string get_power_supply_online_filepath() {
@@ -894,10 +891,14 @@ namespace gsr {
         const Monitor *focused_monitor = nullptr;
         if(cursor_info) {
             focused_monitor = find_monitor_by_name(monitors, cursor_info->monitor_name);
+            if(!focused_monitor)
+                focused_monitor = &monitors.front();
             cursor_position = cursor_info->position;
         } else {
             const mgl::vec2i monitor_position_query_value = (x11_cursor_window || gsr_info.system_info.display_server != DisplayServer::WAYLAND) ? cursor_position : create_window_get_center_position(display);
             focused_monitor = find_monitor_at_position(monitors, monitor_position_query_value);
+            if(!focused_monitor)
+                focused_monitor = &monitors.front();
         }
 
         // Wayland doesn't allow XGrabPointer/XGrabKeyboard when a wayland application is focused.
@@ -933,8 +934,11 @@ namespace gsr {
         // when a compositor isn't running.
         window_create_params.graphics_api = gsr_info.system_info.display_server == DisplayServer::WAYLAND ? MGL_GRAPHICS_API_GLX : MGL_GRAPHICS_API_EGL;
 
-        if(!window->create("gsr ui", window_create_params))
+        if(!window->create("gsr ui", window_create_params)) {
             fprintf(stderr, "error: failed to create window\n");
+            window.reset();
+            return;
+        }
 
         //window->set_low_latency(true);
 
@@ -2137,8 +2141,25 @@ namespace gsr {
                 cursor_info = cursor_tracker->get_latest_cursor_info();
             }
 
-            if(cursor_info)
-                return cursor_info->monitor_name;
+            std::string focused_monitor_name;
+            if(cursor_info) {
+                focused_monitor_name = std::move(cursor_info->monitor_name);
+            } else {
+                mgl_context *context = mgl_get_context();
+                Display *display = (Display*)context->connection;
+
+                Window x11_cursor_window = None;
+                mgl::vec2i cursor_position = get_cursor_position(display, &x11_cursor_window);
+
+                const mgl::vec2i monitor_position_query_value = (x11_cursor_window || gsr_info.system_info.display_server != DisplayServer::WAYLAND) ? cursor_position : create_window_get_center_position(display);
+                auto monitors = get_monitors(display);
+                const Monitor *focused_monitor = find_monitor_at_position(monitors, monitor_position_query_value);
+                if(focused_monitor)
+                    focused_monitor_name = focused_monitor->name;
+            }
+
+            if(!focused_monitor_name.empty())
+                return focused_monitor_name;
             else if(!capture_options.monitors.empty())
                 return capture_options.monitors.front().name;
             else
@@ -2290,6 +2311,11 @@ namespace gsr {
             args.push_back("yes");
         }
 
+        if(gsr_info.system_info.gsr_version >= GsrVersion{5, 5, 0}) {
+            args.push_back("-replay-storage");
+            args.push_back(config.replay_config.replay_storage.c_str());
+        }
+
         char region_str[128];
         add_common_gpu_screen_recorder_args(args, config.replay_config.record_options, audio_tracks, video_bitrate, size, region_str, sizeof(region_str), region_selector);