Add message if you try to install again after already success (resolves

#25)
henkaku · Nov 27, 2016 · 83bd41d · 83bd41d
1 parent 62a94ef
commit 83bd41d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/installer/installer.c b/installer/installer.c
@@ -635,14 +635,24 @@ int _start(SceSize argc, void *argp) {
 	call_syscall(0, 0, 0, 0xff3);
 
 	DRAWF("\n\n");
-	if (ret < 0) {
+	if (ret == 0x8002d013) {
+		cui_data.fg_color = 0xFFFF00FF;
+		DRAWF("taiHEN has already been started!\n");
+		cui_data.fg_color = 0xFFFFFFFF;
+		DRAWF("(press any key to exit)\n");
+		SceCtrlData buf;
+		while (sceCtrlPeekBufferPositive(0, &buf, 1) > 0) {
+			if (buf.buttons != 0) {
+				break;
+			}
+		}
+	} else if (ret < 0) {
 		cui_data.fg_color = 0xFF0000FF;
 		DRAWF("HENkaku failed to install: error code 0x%x\n", ret);
 		cui_data.fg_color = 0xFFFFFFFF;
 		DRAWF("(press any key to exit)\n");
 		SceCtrlData buf;
 		while (sceCtrlPeekBufferPositive(0, &buf, 1) > 0) {
-			LOG("buttons: %x\n", buf.buttons);
 			if (buf.buttons != 0) {
 				break;
 			}

diff --git a/payload/payload.c b/payload/payload.c
@@ -471,21 +471,26 @@ int load_taihen(void) {
 	LOG("LoadTaiHEN: 0x%08X", taiid);
 	remove_sigpatches();
 	LOG("Removed temp patches");
+	result = 0;
 	ret = sceKernelStartModuleForDriver(taiid, 0, NULL, 0, NULL, &result);
 	LOG("StartTaiHEN: 0x%08X, 0x%08X", ret, result);
-	if (result < 0) {
+	if (ret == 0) {
 		ret = result;
+	}
+	if (ret < 0) {
 		goto end;
 	}
 
 	// load henkaku kernel
 	modid = sceKernelLoadModuleWithoutStartForDriver("ux0:app/MLCL00001/henkaku.skprx", 0, &opt);
 	LOG("LoadHENKaku kernel: 0x%08X", modid);
-	result = -1;
+	result = 0;
 	ret = sceKernelStartModuleForDriver(modid, 0, NULL, 0, NULL, &result);
 	LOG("StartHENkaku kernel: 0x%08X, 0x%08X", ret, result);
-	if (result < 0) {
+	if (ret == 0) {
 		ret = result;
+	}
+	if (ret < 0) {
 		goto end;
 	}