Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix save/load file for scene sequence

Browse Source
This commit is contained in:
WarmUpTill 2018-07-20 21:00:06 +02:00
parent 70c0a8ed57
commit 299f7c00e0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scene-round-trip.cpp
View File

@ -141,7 +141,10 @@ void SceneSwitcher::on_sceneRoundTripSave_clicked()
for (SceneRoundTripSwitch s : switcher->sceneRoundTripSwitches)
{
out << QString::fromStdString(GetWeakSourceName(s.scene1)) << "\n";
out << QString::fromStdString(GetWeakSourceName(s.scene2)) << "\n";
if (s.usePreviousScene)
out << (PREVIOUS_SCENE_NAME) << "\n";
else
out << QString::fromStdString(GetWeakSourceName(s.scene2)) << "\n";
out << s.delay << "\n";
out << QString::fromStdString(s.sceneRoundTripStr) << "\n";
out << QString::fromStdString(GetWeakSourceName(s.transition)) << "\n";
@ -176,7 +179,7 @@ void SceneSwitcher::on_sceneRoundTripLoad_clicked()
OBSWeakSource scene2 = GetWeakSourceByQString(lines[1]);
OBSWeakSource transition = GetWeakTransitionByQString(lines[4]);
if (WeakSourceValid(scene1) && WeakSourceValid(scene2)
if (WeakSourceValid(scene1) && ((lines[1] == QString(PREVIOUS_SCENE_NAME)) || (WeakSourceValid(scene2)))
&& WeakSourceValid(transition))
{
newSceneRoundTripSwitch.emplace_back(SceneRoundTripSwitch(
@ -184,7 +187,7 @@ void SceneSwitcher::on_sceneRoundTripLoad_clicked()
GetWeakSourceByQString(lines[1]),
GetWeakTransitionByQString(lines[4]),
lines[2].toInt(),
(lines[1].toUtf8().constData() == QString(PREVIOUS_SCENE_NAME)),
(lines[1] == QString(PREVIOUS_SCENE_NAME)),
lines[3].toStdString()));
}
lines.clear();