2 months ago · bb5f880f0f
--- a/src/App/Osu/Changelog.cpp
+++ b/src/App/Osu/Changelog.cpp
@@ -30,6 +30,7 @@ Changelog::Changelog() : ScreenBackable() {
 
     latest.title =
 
         UString::format("%.2f (%s, %s)", convar->getConVarByName("osu_version")->getFloat(), __DATE__, __TIME__);
 
     latest.changes.push_back("- Fixed crash when osu! folder couldn't be found");
 
+    latest.changes.push_back("- Fixed skin selection menu being drawn behind back button");
 
     changelogs.push_back(latest);
 
 
 
     CHANGELOG v35_08;
--- a/src/App/Osu/OptionsMenu.cpp
+++ b/src/App/Osu/OptionsMenu.cpp
@@ -1434,8 +1434,13 @@ void OptionsMenu::draw(Graphics *g) {
 
         if(!isPlayingBeatmap) osu->getHUD()->drawDummy(g);
 
     } else if(m_playfieldBorderSizeSlider->isActive()) {
 
         osu->getHUD()->drawPlayfieldBorder(g, GameRules::getPlayfieldCenter(), GameRules::getPlayfieldSize(), 100);
 
-    } else
 
+    } else {
 
         ScreenBackable::draw(g);
 
+    }
 
+
 
+    // Re-drawing context menu to make sure it's drawn on top of the back button
 
+    // Context menu input still gets processed first, so this is fine
 
+    m_contextMenu->draw(g);
 
 
 
     if(m_cursorSizeSlider->getFloat() < 0.15f) engine->getMouse()->drawDebug(g);