Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-06-20 11:33:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix crash on settings import (#102)

Browse Source 
This crash could happen if the scene switcher was currently stuck waiting in a scene sequence causing while the import of new settings took place potentially invalidating the settings of the sequence after wakeup.
This commit is contained in:
WarmUpTill 2021-01-20 19:01:56 +01:00 committed by GitHub
parent 0950d93828
commit b42de8d5c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/general.cpp
View File

@ -342,6 +342,11 @@ void AdvSceneSwitcher::on_exportSettings_clicked()
void AdvSceneSwitcher::on_importSettings_clicked()
{
// scene switcher could be stuck in a sequence
// so it needs to be stopped before importing new settings
bool start = !switcher->stop;
switcher->Stop();
std::lock_guard<std::mutex> lock(switcher->m);
QString directory = QFileDialog::getOpenFileName(
@ -387,6 +392,10 @@ void AdvSceneSwitcher::on_importSettings_clicked()
DisplayMessage(obs_module_text(
"AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess"));
close();
// restart scene switcher if it was active
if (start)
switcher->Start();
}
int findTabIndex(QTabWidget *tabWidget, int pos)