mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-08-22 09:15:57 -05:00
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:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user