Bug fix

RocketRobz · RocketRobz · commit aca3d11f2483 · 2021-04-27T20:43:27.000-06:00
diff --git a/title/arm9/source/main.cpp b/title/arm9/source/main.cpp
@@ -989,8 +989,11 @@ int main(int argc, char **argv)
 		stop();
 	}
 
-	if (*(u32*)(0x02000004) == 0xA32AE2B3) {	// Unlaunch check
+	u32 softResetParamsBak = 0;
+	if (*(u32*)(0x02000004) != 0) {
 		*(u32*)(0x02000000) = 0; // Clear soft-reset params
+	} else {
+		softResetParamsBak = *(u32*)(0x02000000);
 	}
 	// Soft-reset parameters
 	/*
@@ -1078,6 +1081,8 @@ int main(int argc, char **argv)
 		fclose(twlCfg);
 	}
 
+	*(u32*)(0x02000000) = softResetParamsBak;
+
 	if (access(settingsinipath, F_OK) != 0 && (access("fat:/", F_OK) == 0)) {
 		settingsinipath =
 		    DSIMENUPP_INI_FC; // Fallback to .ini path on flashcard, if not found on

Original file line number	Diff line number	Diff line change
`@@ -989,8 +989,11 @@ int main(int argc, char **argv)`
`989`	`989`	`stop();`
`990`	`990`	`}`
`991`	`991`
`992`		`- if ((u32)(0x02000004) == 0xA32AE2B3) { // Unlaunch check`
	`992`	`+ u32 softResetParamsBak = 0;`
	`993`	`+ if ((u32)(0x02000004) != 0) {`
`993`	`994`	`(u32)(0x02000000) = 0; // Clear soft-reset params`
	`995`	`+ } else {`
	`996`	`+ softResetParamsBak = (u32)(0x02000000);`
`994`	`997`	`}`
`995`	`998`	`// Soft-reset parameters`
`996`	`999`	`/*`
`@@ -1078,6 +1081,8 @@ int main(int argc, char **argv)`
`1078`	`1081`	`fclose(twlCfg);`
`1079`	`1082`	`}`
`1080`	`1083`
	`1084`	`+ (u32)(0x02000000) = softResetParamsBak;`
	`1085`	`+`
`1081`	`1086`	`if (access(settingsinipath, F_OK) != 0 && (access("fat:/", F_OK) == 0)) {`
`1082`	`1087`	`settingsinipath =`
`1083`	`1088`	`DSIMENUPP_INI_FC; // Fallback to .ini path on flashcard, if not found on`