From 76be75474b134135bdc628825d6b007aaf9774dd Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sat, 10 Dec 2022 16:18:03 +0100 Subject: [PATCH] Set default path for import to desktop folder --- src/general.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/general.cpp b/src/general.cpp index bbad0878..d020a010 100644 --- a/src/general.cpp +++ b/src/general.cpp @@ -151,6 +151,7 @@ void AdvSceneSwitcher::closeEvent(QCloseEvent *) ui->macroActionConditionSplitter->sizes(); switcher->macroListMacroEditSplitterPosition = ui->macroListMacroEditSplitter->sizes(); + obs_frontend_save(); } @@ -308,11 +309,8 @@ void AdvSceneSwitcher::on_exportSettings_clicked() } obs_data_t *obj = obs_data_create(); - switcher->saveSettings(obj); - obs_data_save_json(obj, file.fileName().toUtf8().constData()); - obs_data_release(obj); } @@ -323,13 +321,13 @@ void AdvSceneSwitcher::on_importSettings_clicked() bool start = !switcher->stop; switcher->Stop(); - std::lock_guard lock(switcher->m); - + QString desktopPath = QStandardPaths::writableLocation( + QStandardPaths::DesktopLocation); QString directory = QFileDialog::getOpenFileName( this, tr(obs_module_text( "AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle")), - QDir::currentPath(), + desktopPath, tr(obs_module_text( "AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType"))); if (directory.isEmpty()) { @@ -350,12 +348,14 @@ void AdvSceneSwitcher::on_importSettings_clicked() return; } + std::lock_guard lock(switcher->m); switcher->loadSettings(obj); - obs_data_release(obj); (void)DisplayMessage(obs_module_text( "AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess")); + // Just close the UI and let the user reopen it to not have to + // implement updating each setting close(); // Restart scene switcher if it was active