Fix crash when LevelInfoLayer::onBack is called

SpaghettDev · Feb 9, 2024 · 805fc85 · 805fc85
1 parent 3191c80
commit 805fc85
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.6.2] - 2024-02-09
+
+### Fixed
+
+- Crash when leaving LevelInfoLayer
+
 ## [1.6.1-beta.3] - 2024-02-07
 
 ### Changed

diff --git a/mod.json b/mod.json
@@ -4,7 +4,7 @@
 		"win": "2.204",
 		"android": "2.205"
 	},
-	"version": "v1.6.1-beta.3",
+	"version": "v1.6.2",
 	"id": "spaghettdev.gd-roulette",
 	"name": "GD-Roulette",
 	"developer": "SpaghettDev",

diff --git a/src/layers/LevelInfoLayer.cpp b/src/layers/LevelInfoLayer.cpp
@@ -49,18 +49,18 @@ class $modify(LevelInfoLayer)
 
 	void onBack(CCObject* sender)
 	{
-		if (levelIDs.size() != 1)
-			levelIDs.pop_back();
-
-		if (g_rouletteManager.isPlayingRoulette && g_rouletteManager.rouletteLayer && levelIDs.back() == g_rouletteManager.currentLevelID)
+		if (g_rouletteManager.isPlayingRoulette)
 		{
-			as<CCLabelBMFont*>(
-				g_rouletteManager.rouletteLayer->m_pPlayingMenu->getChildByTag(20)
-			)->setString(fmt::format("{}%", g_rouletteManager.levelPercentageGoal).c_str());
-		}
+			if (levelIDs.size() != 0)
+				levelIDs.pop_back();
 
-		if (levelIDs.size() == 1)
-			levelIDs.pop_back();
+			if (g_rouletteManager.rouletteLayer && levelIDs.back() == g_rouletteManager.currentLevelID)
+			{
+				as<CCLabelBMFont*>(
+					g_rouletteManager.rouletteLayer->m_pPlayingMenu->getChildByTag(20)
+				)->setString(fmt::format("{}%", g_rouletteManager.levelPercentageGoal).c_str());
+			}
+		}
 
 		LevelInfoLayer::onBack(sender);
 	}