ad3laid3/skate3recomp-multiplayer
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

installer: read the ISO install directory before the wizard moves the paths (SDK bump)

Browse source
This commit is contained in:
mchughalex 2026-07-24 20:47:39 +01:00
parent ceefe4dc37
commit d1a3e3d255
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/skate3_iso_installer.cpp
View file

@ -365,10 +365,15 @@ bool IsGameInstalled(const std::filesystem::path& game_root) {
void ShowRexglueIsoInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig runtime_paths, void ShowRexglueIsoInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig runtime_paths,
std::function<void(rex::PathConfig)> complete) { 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 pick_source = []() { return PickIsoFile(); };
auto install = [game_root = runtime_paths.game_data_root]( auto install = [game_root](const std::filesystem::path& source,
const std::filesystem::path& source, std::atomic<uint64_t>& copied_bytes, std::atomic<uint64_t>& copied_bytes,
std::atomic<uint64_t>& total_bytes, std::string& error) { std::atomic<uint64_t>& total_bytes, std::string& error) {
XboxIsoReader iso; XboxIsoReader iso;
if (!iso.Open(source, error)) { if (!iso.Open(source, error)) {
return false; return false;
@ -387,7 +392,7 @@ void ShowRexglueIsoInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig r
new rex::ui::InstallWizardDialog( new rex::ui::InstallWizardDialog(
drawer, "Setup", "Game Files", drawer, "Setup", "Game Files",
"Skate 3 game files were not found. Select your Xbox 360 ISO to install them.", "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 { [runtime_paths = std::move(runtime_paths), complete = std::move(complete)]() mutable {
if (complete) { if (complete) {
complete(std::move(runtime_paths)); complete(std::move(runtime_paths));

2
third_party/rexglue-sdk vendored

@ -1 +1 @@
Subproject commit 8ea87c6d4b577c9a361877eb0781a68ffb1a4650 Subproject commit 7eb0faf7787f5e01333c228b8e3f03c32f7295ea