Skip to content

Commit 805fc85

Browse files
committed
Fix crash when LevelInfoLayer::onBack is called
1 parent 3191c80 commit 805fc85

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## [1.6.2] - 2024-02-09
9+
10+
### Fixed
11+
12+
- Crash when leaving LevelInfoLayer
13+
814
## [1.6.1-beta.3] - 2024-02-07
915

1016
### Changed

mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"win": "2.204",
55
"android": "2.205"
66
},
7-
"version": "v1.6.1-beta.3",
7+
"version": "v1.6.2",
88
"id": "spaghettdev.gd-roulette",
99
"name": "GD-Roulette",
1010
"developer": "SpaghettDev",

src/layers/LevelInfoLayer.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@ class $modify(LevelInfoLayer)
4949

5050
void onBack(CCObject* sender)
5151
{
52-
if (levelIDs.size() != 1)
53-
levelIDs.pop_back();
54-
55-
if (g_rouletteManager.isPlayingRoulette && g_rouletteManager.rouletteLayer && levelIDs.back() == g_rouletteManager.currentLevelID)
52+
if (g_rouletteManager.isPlayingRoulette)
5653
{
57-
as<CCLabelBMFont*>(
58-
g_rouletteManager.rouletteLayer->m_pPlayingMenu->getChildByTag(20)
59-
)->setString(fmt::format("{}%", g_rouletteManager.levelPercentageGoal).c_str());
60-
}
54+
if (levelIDs.size() != 0)
55+
levelIDs.pop_back();
6156

62-
if (levelIDs.size() == 1)
63-
levelIDs.pop_back();
57+
if (g_rouletteManager.rouletteLayer && levelIDs.back() == g_rouletteManager.currentLevelID)
58+
{
59+
as<CCLabelBMFont*>(
60+
g_rouletteManager.rouletteLayer->m_pPlayingMenu->getChildByTag(20)
61+
)->setString(fmt::format("{}%", g_rouletteManager.levelPercentageGoal).c_str());
62+
}
63+
}
6464

6565
LevelInfoLayer::onBack(sender);
6666
}

0 commit comments

Comments
 (0)