Skip to content

frontend: Fix OAuth and dock state save corruption #13445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PatTheMav wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −6
Open

frontend: Fix OAuth and dock state save corruption #13445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions frontend/widgets/OBSBasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
#include <QThread>
#include <QWidgetAction>

#include <mutex>
#ifdef _WIN32
#include <sstream>
#endif
Expand Down Expand Up @@ -107,6 +108,10 @@ extern bool cef_js_avail;
extern void DestroyPanelCookieManager();
extern void CheckExistingCookieId();

namespace {
std::once_flag saveOnceFlag;
}

static void AddExtraModulePaths()
{
string plugins_path, plugins_data_path;
Expand Down Expand Up @@ -1849,16 +1854,19 @@ void OBSBasic::saveAll()
saveGeometry().toBase64().constData());
}

Auth::Save();
SaveProjectNow();
std::call_once(saveOnceFlag, [this]() {
Auth::Save();
SaveProjectNow();

config_set_string(App()->GetUserConfig(), "BasicWindow", "DockState", saveState().toBase64().constData());
config_set_string(App()->GetUserConfig(), "BasicWindow", "DockState",
saveState().toBase64().constData());

#ifdef BROWSER_AVAILABLE
if (cef) {
SaveExtraBrowserDocks();
}
if (cef) {
SaveExtraBrowserDocks();
}
#endif
});

config_set_int(App()->GetAppConfig(), "General", "LastVersion", LIBOBS_API_VER);
config_save_safe(App()->GetAppConfig(), "tmp", nullptr);
Expand Down
Loading