Update version. Don't load plugins in recovery

isage · Nov 22, 2024 · b959c6c · b959c6c
1 parent 4b0a1fc
commit b959c6c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/adrenaline_version.h b/adrenaline_version.h
@@ -21,7 +21,7 @@
 
 #define ADRENALINE_VERSION_MAJOR    7
 #define ADRENALINE_VERSION_MINOR    1
-#define ADRENALINE_VERSION_MICRO    1
+#define ADRENALINE_VERSION_MICRO    2
 #define ADRENALINE_VERSION ((ADRENALINE_VERSION_MAJOR << 24) | (ADRENALINE_VERSION_MINOR << 16) | (ADRENALINE_VERSION_MICRO << 8))
 
 #define xstr(s) #s

diff --git a/bubble/pkg/sce_sys/livearea/contents/template.xml b/bubble/pkg/sce_sys/livearea/contents/template.xml
@@ -12,7 +12,7 @@
 	<frame id="frame2">
 		<liveitem>
 			<text valign="bottom" align="left" text-align="left" text-valign="bottom" line-space="3" ellipsis="on">
-				<str color="#ffffff" size="50" bold="on" shadow="on">6.61 Adrenaline</str>
+				<str color="#ffffff" size="50" bold="on" shadow="on">Adrenaline 7.1.2</str>
 			</text>
 		</liveitem>
 	</frame>

diff --git a/cef/systemctrl/init_patch.c b/cef/systemctrl/init_patch.c
@@ -281,7 +281,9 @@ int PatchInit(int (* module_bootstart)(SceSize, void *), void *argp) {
 	_sw(0x02402021, init_addr + 0x1868); //move $a0, $s2
 	MAKE_CALL(init_addr + 0x1878, sceKernelLoadModuleBufferBootInitBtcnfPatched);
 
-	MAKE_JUMP(init_addr + 0x1C5C, sceKernelStartModulePatched);
+	// TODO: don't hook in recovery
+	if(rebootex_config.bootfileindex != BOOT_RECOVERY)
+		MAKE_JUMP(init_addr + 0x1C5C, sceKernelStartModulePatched);
 
 	ClearCaches();
 

diff --git a/cef/systemctrl/main.c b/cef/systemctrl/main.c
@@ -757,6 +757,7 @@ int OnModuleStart(SceModule2 *mod) {
 }
 
 int module_start(SceSize args, void *argp) {
+	memcpy(&rebootex_config, (void *)0x88FB0000, sizeof(RebootexConfig));
 	PatchSysmem();
 	PatchLoadCore();
 	PatchInterruptMgr();
@@ -771,7 +772,5 @@ int module_start(SceSize args, void *argp) {
 
 	initAdrenaline();
 
-	memcpy(&rebootex_config, (void *)0x88FB0000, sizeof(RebootexConfig));
-
 	return 0;
 }
diff --git a/cef/updater/main.c b/cef/updater/main.c
@@ -81,7 +81,8 @@ int main(void) {
 	printf("6.61 Adrenaline-%d.%d.%d Installer\n", ADRENALINE_VERSION_MAJOR, ADRENALINE_VERSION_MINOR, ADRENALINE_VERSION_MICRO);
 	printf("Changes:\n\n");
 
-	printf("- Fixed version info.\n");
+	printf("- Fixed photo/video browser.\n");
+	printf("- Don't load plugins in recovery.\n");
 
 	printf("\n");
 

diff --git a/readme.md b/readme.md
@@ -35,6 +35,10 @@ ux0:app/PSPEMUCFW/sce_module/adrenaline_kernel.skprx
 Changelog
 ---------
 
+### Changelog v7.1.2
+- Fixed photo/video browser.
+- Don't load plugins in recovery.
+
 ### Changelog v7.1.1
 - Fixed version info.