From d1a3e3d255534bbd97f79df81e9de6c096eb7107 Mon Sep 17 00:00:00 2001
From: mchughalex <25671999+mchughalex@users.noreply.github.com>
Date: Fri, 24 Jul 2026 20:47:39 +0100
Subject: [PATCH] installer: read the ISO install directory before the wizard
 moves the paths (SDK bump)

---
 src/skate3_iso_installer.cpp | 13 +++++++++----
 third_party/rexglue-sdk      |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/skate3_iso_installer.cpp b/src/skate3_iso_installer.cpp
index c0b34bd..a893a3a 100644
--- a/src/skate3_iso_installer.cpp
+++ b/src/skate3_iso_installer.cpp
@@ -365,10 +365,15 @@ bool IsGameInstalled(const std::filesystem::path& game_root) {
 
 void ShowRexglueIsoInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig runtime_paths,
                                  std::function<void(rex::PathConfig)> complete) {
+  // Copied up front: the constructor call below move-captures runtime_paths,
+  // and argument evaluation order is unspecified, so reading the path out of
+  // it in the same expression can observe the moved-from value.
+  const auto game_root = runtime_paths.game_data_root;
+
   auto pick_source = []() { return PickIsoFile(); };
-  auto install = [game_root = runtime_paths.game_data_root](
-                     const std::filesystem::path& source, std::atomic<uint64_t>& copied_bytes,
-                     std::atomic<uint64_t>& total_bytes, std::string& error) {
+  auto install = [game_root](const std::filesystem::path& source,
+                             std::atomic<uint64_t>& copied_bytes,
+                             std::atomic<uint64_t>& total_bytes, std::string& error) {
     XboxIsoReader iso;
     if (!iso.Open(source, error)) {
       return false;
@@ -387,7 +392,7 @@ void ShowRexglueIsoInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig r
   new rex::ui::InstallWizardDialog(
       drawer, "Setup", "Game Files",
       "Skate 3 game files were not found. Select your Xbox 360 ISO to install them.",
-      runtime_paths.game_data_root.string(), std::move(pick_source), std::move(install),
+      game_root.string(), std::move(pick_source), std::move(install),
       [runtime_paths = std::move(runtime_paths), complete = std::move(complete)]() mutable {
         if (complete) {
           complete(std::move(runtime_paths));
diff --git a/third_party/rexglue-sdk b/third_party/rexglue-sdk
index 8ea87c6..7eb0faf 160000
--- a/third_party/rexglue-sdk
+++ b/third_party/rexglue-sdk
@@ -1 +1 @@
-Subproject commit 8ea87c6d4b577c9a361877eb0781a68ffb1a4650
+Subproject commit 7eb0faf7787f5e01333c228b8e3f03c32f7295ea