From ac1f091a62d7816470a5da45bb0182864d3188ac Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Thu, 18 Sep 2025 00:30:24 +0200
Subject: [PATCH] Remove the excess -mstackrealign and only run the Discord
 timer if Discord integration is enabled.

---
 cmake/flags-gcc.cmake    | 4 ++--
 src/qt/qt_main.cpp       | 6 ++++--
 src/qt/qt_mainwindow.cpp | 5 ++++-
 src/qt/qt_mainwindow.hpp | 2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cmake/flags-gcc.cmake b/cmake/flags-gcc.cmake
index fcb507907..90eb52cd1 100644
--- a/cmake/flags-gcc.cmake
+++ b/cmake/flags-gcc.cmake
@@ -14,8 +14,8 @@
 #
 
 # Define our flags
-string(APPEND CMAKE_C_FLAGS_INIT                " -fomit-frame-pointer -mstackrealign -Wall -fno-strict-aliasing -Werror=implicit-int -Werror=implicit-function-declaration -Werror=int-conversion -Werror=strict-prototypes -Werror=old-style-definition")
-string(APPEND CMAKE_CXX_FLAGS_INIT              " -fomit-frame-pointer -mstackrealign -Wall -fno-strict-aliasing")
+string(APPEND CMAKE_C_FLAGS_INIT                " -fomit-frame-pointer -Wall -fno-strict-aliasing -Werror=implicit-int -Werror=implicit-function-declaration -Werror=int-conversion -Werror=strict-prototypes -Werror=old-style-definition")
+string(APPEND CMAKE_CXX_FLAGS_INIT              " -fomit-frame-pointer -Wall -fno-strict-aliasing")
 string(APPEND CMAKE_C_FLAGS_RELEASE_INIT        " -g0 -O3")
 string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT      " -g0 -O3")
 string(APPEND CMAKE_C_FLAGS_DEBUG_INIT          " -ggdb -Og")
diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp
index 664b495bd..2bc3eacbb 100644
--- a/src/qt/qt_main.cpp
+++ b/src/qt/qt_main.cpp
@@ -515,6 +515,8 @@ main_thread_fn()
 
 static std::thread *main_thread;
 
+QTimer discordupdate;
+
 #ifdef Q_OS_WINDOWS
 WindowsDarkModeFilter* vmm_dark_mode_filter = nullptr;
 #endif
@@ -865,7 +867,6 @@ main(int argc, char *argv[])
     onesec.start(1000);
 
 #ifdef DISCORD
-    QTimer discordupdate;
     if (discord_loaded) {
         QTimer::singleShot(1000, &app, [] {
             if (enable_discord) {
@@ -877,7 +878,8 @@ main(int argc, char *argv[])
         QObject::connect(&discordupdate, &QTimer::timeout, &app, [] {
             discord_run_callbacks();
         });
-        discordupdate.start(1000);
+        if (enable_discord)
+            discordupdate.start(1000);
     }
 #endif
 
diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index 4f616e61b..954547078 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -2344,8 +2344,11 @@ MainWindow::on_actionEnable_Discord_integration_triggered(bool checked)
     if (enable_discord) {
         discord_init();
         discord_update_activity(dopause);
-    } else
+        discordupdate.start(1000);
+    } else {
         discord_close();
+        discordupdate.stop();
+    }
 #endif
 }
 
diff --git a/src/qt/qt_mainwindow.hpp b/src/qt/qt_mainwindow.hpp
index 792685f42..f562c2ea9 100644
--- a/src/qt/qt_mainwindow.hpp
+++ b/src/qt/qt_mainwindow.hpp
@@ -15,6 +15,8 @@
 
 #include "qt_vmmanager_protocol.hpp"
 
+extern QTimer discordupdate;
+
 class MediaMenu;
 class RendererStack;