From 873ee8e7ba70721a3611512dd0393d6a95d64a72 Mon Sep 17 00:00:00 2001 From: Clayton Groeneveld Date: Thu, 2 Jun 2022 00:32:25 -0500 Subject: [PATCH] UI: Fix reset ui warning showing on first start If a plugin adds a dock and the program is run for the first time, the reset ui warning would show up. --- UI/window-basic-main.cpp | 8 ++++---- UI/window-basic-main.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 75a87a93d..1853cf2c4 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -1980,12 +1980,12 @@ void OBSBasic::OBSInit() App()->GlobalConfig(), "BasicWindow", "DockState"); if (!dockStateStr) { - on_resetDocks_triggered(); + on_resetDocks_triggered(true); } else { QByteArray dockState = QByteArray::fromBase64(QByteArray(dockStateStr)); if (!restoreState(dockState)) - on_resetDocks_triggered(); + on_resetDocks_triggered(true); } bool pre23Defaults = config_get_bool(App()->GlobalConfig(), "General", @@ -8781,7 +8781,7 @@ int OBSBasic::GetProfilePath(char *path, size_t size, const char *file) const return snprintf(path, size, "%s/%s/%s", profiles_path, profile, file); } -void OBSBasic::on_resetDocks_triggered() +void OBSBasic::on_resetDocks_triggered(bool force) { /* prune deleted extra docks */ for (int i = extraDocks.size() - 1; i >= 0; i--) { @@ -8790,7 +8790,7 @@ void OBSBasic::on_resetDocks_triggered() } } - if (extraDocks.size()) { + if (extraDocks.size() && !force) { QMessageBox::StandardButton button = QMessageBox::question( this, QTStr("ResetUIWarning.Title"), QTStr("ResetUIWarning.Text")); diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp index 24660492b..4ab99049f 100644 --- a/UI/window-basic-main.hpp +++ b/UI/window-basic-main.hpp @@ -1083,7 +1083,7 @@ private slots: void on_stats_triggered(); void on_resetUI_triggered(); - void on_resetDocks_triggered(); + void on_resetDocks_triggered(bool force = false); void on_lockDocks_toggled(bool lock); void PauseToggled();