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

Merge branch 'master' into UI

Browse Source
This commit is contained in:
WarmUpTill
2020-10-12 21:48:30 +02:00
parent f22da7ff31 1e6a022787
commit 26697faa9f
5 changed files with 63 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/general.cpp
View File

@@ -305,6 +305,7 @@ void SceneSwitcher::on_exportSettings_clicked()
switcher->saveTimeSwitches(obj);
switcher->saveAudioSwitches(obj);
switcher->saveGeneralSettings(obj);
switcher->saveHotkeys(obj);
obs_data_save_json(obj, file.fileName().toUtf8().constData());
@@ -350,6 +351,7 @@ void SceneSwitcher::on_importSettings_clicked()
switcher->loadTimeSwitches(obj);
switcher->loadAudioSwitches(obj);
switcher->loadGeneralSettings(obj);
switcher->loadHotkeys(obj);
obs_data_release(obj);