Fix rare crash

Alphalaneous · Apr 7, 2024 · 9b9bdf2 · 9b9bdf2
1 parent 2e52447
commit 9b9bdf2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/mod.json b/mod.json
@@ -3,7 +3,7 @@
 	"gd": {
 		"win": "2.204"
 	},
-	"version": "v0.5.14",
+	"version": "v0.5.15",
 	"id": "zalphalaneous.minecraft",
 	"name": "Minecraftify!",
 	"developer": "Alphalaneous",

diff --git a/src/ui/hooks/LoadingLayer.h b/src/ui/hooks/LoadingLayer.h
@@ -10,13 +10,20 @@ class $modify(MyLoadingLayer, LoadingLayer){
 	float loadingScaleX = 1.5;
 	float loadingScaleY = 1.4;
 	bool isInitialOpen = true;
+	bool didHook = false;
 
 	TodoReturn loadingFinished(){
-		LoadingLayer::loadingFinished();
-
-		if(GlobalVars::getSharedInstance()->isInitialLaunch){
-			this->scheduleOnce(schedule_selector(MyLoadingLayer::doFadeOut), 0.05f);
+
+		if(this->m_fields->didHook){
+			if(GlobalVars::getSharedInstance()->isInitialLaunch){
+				this->scheduleOnce(schedule_selector(MyLoadingLayer::doFadeOut), 0.05f);
+			}
+		}
+		else{
+			GlobalVars::getSharedInstance()->isInitialLaunch = false;
 		}
+
+		LoadingLayer::loadingFinished();
 	}
 
 	void doFadeOut(float dt){
@@ -46,6 +53,8 @@ class $modify(MyLoadingLayer, LoadingLayer){
 			return false;
 		}
 
+		this->m_fields->didHook = true;
+
 #ifdef GEODE_IS_WINDOWS
 		auto hwnd = FindWindowW(NULL, L"Geometry Dash");
     	SetWindowTextA(hwnd, "Minecraft* 2.2");