From 37e5c67616282699a7ea9af57d165aa05aeb1b0e Mon Sep 17 00:00:00 2001
From: collecting <collecting@citron-emu.org>
Date: Mon, 29 Sep 2025 04:08:29 +0000
Subject: [PATCH 1/2] fix: Untoggle UI & Wayland Qt Functions

---
 src/citron/main.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/citron/main.cpp b/src/citron/main.cpp
index 94f2c9017..f2d97dab4 100644
--- a/src/citron/main.cpp
+++ b/src/citron/main.cpp
@@ -4428,13 +4428,19 @@ void GMainWindow::OnToggleStatusBar() {
 
 void GMainWindow::OnTogglePerformanceOverlay() {
     if (performance_overlay) {
-        performance_overlay->SetVisible(ui->action_Show_Performance_Overlay->isChecked());
+        const bool is_checked = ui->action_Show_Performance_Overlay->isChecked();
+        performance_overlay->SetVisible(is_checked);
+
+        UISettings::values.show_performance_overlay = is_checked;
     }
 }
 
 void GMainWindow::OnToggleVramOverlay() {
     if (vram_overlay) {
-        vram_overlay->SetVisible(ui->action_Show_Vram_Overlay->isChecked());
+        const bool is_checked = ui->action_Show_Vram_Overlay->isChecked();
+        vram_overlay->SetVisible(is_checked);
+
+        UISettings::values.show_vram_overlay = is_checked;
     }
 }
 
@@ -5527,6 +5533,11 @@ int main(int argc, char* argv[]) {
     QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);
 
     QApplication app(argc, argv);
+#ifdef __linux__
+    if (QGuiApplication::platformName().startsWith(QStringLiteral("wayland"))) {
+        Settings::values.is_wayland_platform.SetValue(true);
+    }
+#endif
 
     #ifdef CITRON_USE_AUTO_UPDATER
     // Check for and apply staged updates before starting the main application

From f2474470cda27febe8e5a375dd1c58a9e0ceb692 Mon Sep 17 00:00:00 2001
From: collecting <collecting@citron-emu.org>
Date: Mon, 29 Sep 2025 05:15:48 +0000
Subject: [PATCH 2/2] fix: Untoggle UI & Wayland Fixes

---
 src/citron/main.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/citron/main.cpp b/src/citron/main.cpp
index f2d97dab4..370abb263 100644
--- a/src/citron/main.cpp
+++ b/src/citron/main.cpp
@@ -1446,10 +1446,10 @@ void GMainWindow::RestoreUIState() {
     restoreState(UISettings::values.state);
     render_window->setWindowFlags(render_window->windowFlags() & ~Qt::FramelessWindowHint);
     render_window->restoreGeometry(UISettings::values.renderwindow_geometry);
-#if MICROPROFILE_ENABLED
+    #if MICROPROFILE_ENABLED
     microProfileDialog->restoreGeometry(UISettings::values.microprofile_geometry);
     microProfileDialog->setVisible(UISettings::values.microprofile_visible.GetValue());
-#endif
+    #endif
 
     game_list->LoadInterfaceLayout();
 
@@ -1469,15 +1469,19 @@ void GMainWindow::RestoreUIState() {
 
     ui->action_Show_Status_Bar->setChecked(UISettings::values.show_status_bar.GetValue());
     statusBar()->setVisible(ui->action_Show_Status_Bar->isChecked());
-    ui->action_Show_Performance_Overlay->setChecked(UISettings::values.show_performance_overlay.GetValue());
+
+    // Force the performance overlay to be off on startup
+    ui->action_Show_Performance_Overlay->setChecked(false);
     if (performance_overlay) {
-        performance_overlay->SetVisible(ui->action_Show_Performance_Overlay->isChecked());
+        performance_overlay->SetVisible(false);
     }
 
-    ui->action_Show_Vram_Overlay->setChecked(UISettings::values.show_vram_overlay.GetValue());
+    // Force the VRAM overlay to be off on startup
+    ui->action_Show_Vram_Overlay->setChecked(false);
     if (vram_overlay) {
-        vram_overlay->SetVisible(ui->action_Show_Vram_Overlay->isChecked());
+        vram_overlay->SetVisible(false);
     }
+
     Debugger::ToggleConsole();
 }
 
@@ -4930,10 +4934,10 @@ void GMainWindow::UpdateUISettings() {
         UISettings::values.renderwindow_geometry = render_window->saveGeometry();
     }
     UISettings::values.state = saveState();
-#if MICROPROFILE_ENABLED
+    #if MICROPROFILE_ENABLED
     UISettings::values.microprofile_geometry = microProfileDialog->saveGeometry();
     UISettings::values.microprofile_visible = microProfileDialog->isVisible();
-#endif
+    #endif
     UISettings::values.single_window_mode = ui->action_Single_Window_Mode->isChecked();
     UISettings::values.fullscreen = ui->action_Fullscreen->isChecked();
     UISettings::values.display_titlebar = ui->action_Display_Dock_Widget_Headers->isChecked();