fix conflicts

Author: TechStudent10

changelog.md

@@ -1,6 +1,9 @@
+# 1.1.1
+- Fixed a potential crash when using the song browser (thank you [hiimjustin000](user:7466002))
+
 # 1.1.0
-- New logo (thank you [Alphalaneous](user:7834088))
-- Cleaned up design (thank you [Alphalaneous](user:7834088))
+- New logo (thank you [Alphalaneous](user:1139015))
+- Cleaned up design (thank you [Alphalaneous](user:1139015))
 
 # 1.0.1
 - Quick bugfix update, fixes the info label issues

src/SettingsLayer.cpp

@@ -158,8 +158,9 @@ void SettingCell::onFMODDebug(CCObject* sender) {
 void SettingCell::onSongSelect(CCObject* sender) {
     auto mol = MoreOptionsLayer::create();
     mol->onSongBrowser(sender);
-    // auto browser = GJSongBrowser::create();
-    // browser->showLayer(true);
+    if (auto songBrowser = CCScene::get()->getChildByType<GJSongBrowser>(0)) {
+        if (songBrowser->m_delegate == mol) songBrowser->m_delegate = nullptr;
+    }
 }
 
 void SettingCell::onCheckboxToggled(CCObject* sender) {