OmniNX/Atmosphere-Pro
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only deinit if necessary

Browse Source
This commit is contained in:
Christoph Baumann
2025-05-22 12:22:32 +02:00
parent 3c290caac1
commit 11d32ec78f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fusee/program/source/fusee_boot_storage.cpp
View File

@@ -2,6 +2,7 @@
#include "fs/fusee_fs_api.hpp" #include "fs/fusee_fs_api.hpp"
#include "fusee_mmc.hpp" #include "fusee_mmc.hpp"
#include "fusee_sd_card.hpp" #include "fusee_sd_card.hpp"
#include "fusee_util.hpp"
#include <exosphere.hpp> #include <exosphere.hpp>
namespace ams::nxboot { namespace ams::nxboot {
@@ -27,9 +28,8 @@ namespace ams::nxboot {
case BootDrive_Boot1Off: case BootDrive_Boot1Off:
{ {
R_TRY(InitializeMmc()); R_TRY(InitializeMmc());
ON_RESULT_FAILURE { FinalizeMmc(); };
R_UNLESS(fs::MountBoot1Off(), fs::ResultInvalidMountName()); R_UNLESS(fs::MountBoot1Off(), fs::ResultInvalidMountName());
ON_RESULT_FAILURE_2 { fs::UnmountBoot1Off(); }; ON_RESULT_FAILURE { fs::UnmountBoot1Off(); };
R_TRY(fs::ChangeDrive("boot1_off:")); R_TRY(fs::ChangeDrive("boot1_off:"));
R_TRY(IsBootStorageValid()); R_TRY(IsBootStorageValid());
g_boot_storage = storage; g_boot_storage = storage;
@@ -38,9 +38,8 @@ namespace ams::nxboot {
case BootDrive_Boot1: case BootDrive_Boot1:
{ {
R_TRY(InitializeMmc()); R_TRY(InitializeMmc());
ON_RESULT_FAILURE { FinalizeMmc(); };
R_UNLESS(fs::MountBoot1(), fs::ResultInvalidMountName()); R_UNLESS(fs::MountBoot1(), fs::ResultInvalidMountName());
ON_RESULT_FAILURE_2 { fs::UnmountBoot1(); }; ON_RESULT_FAILURE { fs::UnmountBoot1(); };
R_TRY(fs::ChangeDrive("boot1:")); R_TRY(fs::ChangeDrive("boot1:"));
R_TRY(IsBootStorageValid()); R_TRY(IsBootStorageValid());
g_boot_storage = storage; g_boot_storage = storage;
@@ -49,6 +48,7 @@ namespace ams::nxboot {
case BootDrive_System: case BootDrive_System:
{ {
R_TRY(InitializeMmc()); R_TRY(InitializeMmc());
/* Only finalize mmc now, next drive to try is SD card */
ON_RESULT_FAILURE { FinalizeMmc(); }; ON_RESULT_FAILURE { FinalizeMmc(); };
R_UNLESS(fs::MountSys(), fs::ResultInvalidMountName()); R_UNLESS(fs::MountSys(), fs::ResultInvalidMountName());
ON_RESULT_FAILURE_2 { fs::UnmountSys(); }; ON_RESULT_FAILURE_2 { fs::UnmountSys(); };