fix crash on importing scene sequence

This crash could occur when a scene sequence was currently in progress and the entries were changed while in the 'wait for ...' state.
This commit is contained in:
WarmUpTill
2020-11-02 18:38:26 +01:00
parent 8e26148255
commit d279b35086

View File

@@ -99,8 +99,6 @@ void AdvSceneSwitcher::on_sceneSequenceSave_clicked()
void AdvSceneSwitcher::on_sceneSequenceLoad_clicked()
{
std::lock_guard<std::mutex> lock(switcher->m);
QString directory = QFileDialog::getOpenFileName(
this, tr("Select a file to read Scene Sequence from ..."),
QDir::currentPath(), tr("Text files (*.txt)"));
@@ -121,7 +119,14 @@ void AdvSceneSwitcher::on_sceneSequenceLoad_clicked()
Msgbox.exec();
return;
}
bool wasRunning = !switcher->stop;
switcher->Stop();
switcher->loadSceneSequenceSwitches(obj);
if (wasRunning)
switcher->Start();
obs_data_release(obj);
QMessageBox Msgbox;