Fix bug with GoldHEN Modifying string.

OSM-Made · Jun 5, 2021 · 216893b · 216893b
1 parent 5b0ab51
commit 216893b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 40 deletions.
diff --git a/Orbis Toolbox/Mono.cpp b/Orbis Toolbox/Mono.cpp
@@ -50,33 +50,32 @@ bool Mono::Init()
 	Vsh_Lx = Get_Image("/%s/common/lib/Sce.Vsh.Lx.dll", sceKernelGetFsSandboxRandomWord());
 	SysfileUtilWrapper = Get_Image("/%s/common/lib/Sce.Vsh.SysfileUtilWrapper.dll", sceKernelGetFsSandboxRandomWord());
 
-	char* Version = UI::Utilities::Get_Version_String();
-	if (Version)
+	SceKernelSystemSwVersion Version;
+	Version.Size = sizeof(SceKernelSystemSwVersion);
+	sceKernelGetSystemSwVersion(&Version);
+	char Version_Short[] = { Version.info[1], Version.info[3], Version.info[4] };
+	int Software_Version = atoi(Version_Short);
+	klog("Software Version: %s %i\n", Version.info, Software_Version);
+
+	switch (Software_Version)
 	{
-		char Version_Short[] = { Version[0], Version[2], Version[3] };
-		int Software_Version = atoi(Version_Short);
-		klog("Software Version: %s %i\n", Version, Software_Version);
-
-		switch (Software_Version)
-		{
-		default:
-			Notify("Unsuported Software Version!! \"%s\"(%i)", Version, Software_Version);
-			break;
-
-		case 505:
-			PUI = "Sce.PlayStation.HighLevel.UI2";
-			PUI_UI2 = "Sce.PlayStation.HighLevel.UI2";
-			PUI_UI3 = "Sce.PlayStation.HighLevel.UI2";
-			break;
-
-		case 672:
-		case 702:
-		case 755:
-			PUI = "Sce.PlayStation.PUI";
-			PUI_UI2 = "Sce.PlayStation.PUI.UI2";
-			PUI_UI3 = "Sce.PlayStation.PUI.UI3";
-			break;
-		}
+	default:
+		klog("Unsuported Software Version!! \"%s\"(%i)\n", Version.info, Software_Version);
+		break;
+
+	case 505:
+		PUI = "Sce.PlayStation.HighLevel.UI2";
+		PUI_UI2 = "Sce.PlayStation.HighLevel.UI2";
+		PUI_UI3 = "Sce.PlayStation.HighLevel.UI2";
+		break;
+
+	case 672:
+	case 702:
+	case 755:
+		PUI = "Sce.PlayStation.PUI";
+		PUI_UI2 = "Sce.PlayStation.PUI.UI2";
+		PUI_UI3 = "Sce.PlayStation.PUI.UI3";
+		break;
 	}
 
 	MonoLog("Init Complete");

diff --git a/Orbis Toolbox/Orbis_Toolbox.cpp b/Orbis Toolbox/Orbis_Toolbox.cpp
@@ -20,10 +20,10 @@ extern "C"
 
 		Mono::Init();
 
+		//TODO: Add buton combo that if detected here will cancel loading.
 		//Sce.PlayStation.Core.Runtime DiagnosticsNative GetGraphicsMemoryStatistics 
 		//TODO: Get Address and offset take a look in IDA see if it calls imports.
 
-		//UI::Utilities::SetVersionString("5.05 OSM's Cool Firmware");
 		System_Monitor::Init();
 		Settings_Menu::Init();
 		//Title_Menu::Init();	
@@ -37,8 +37,6 @@ extern "C"
 	{
 		klog("!! BYE !!\n");
 
-		Notify("Orbis Toolbox: Unloading...");
-
 		Settings_Menu::Term();
 		System_Monitor::Term();
 		//Title_Menu::Term();