Remove the excess -mstackrealign and only run the Discord timer if Discord integration is enabled.
This commit is contained in:
@@ -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")
|
||||
|
||||
@@ -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,6 +878,7 @@ main(int argc, char *argv[])
|
||||
QObject::connect(&discordupdate, &QTimer::timeout, &app, [] {
|
||||
discord_run_callbacks();
|
||||
});
|
||||
if (enable_discord)
|
||||
discordupdate.start(1000);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
|
||||
#include "qt_vmmanager_protocol.hpp"
|
||||
|
||||
extern QTimer discordupdate;
|
||||
|
||||
class MediaMenu;
|
||||
class RendererStack;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user