jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix problem with exporting scene collections/profiles

Browse Source 
When exporting scene collections/profiles existing files are
not overwritten.

Closes jp9000/obs-studio#963
This commit is contained in:
Michel 2017-07-13 18:55:30 +02:00 committed by jp9000
parent ab5a2ef6bf
commit 609334e427
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
UI/window-basic-main-profiles.cpp
View File

@ -524,15 +524,28 @@ void OBSBasic::on_actionExportProfile_triggered()
if (!folder.exists()) {
folder.mkpath(outputDir);
QFile::copy(inputPath + currentProfile + "/basic.ini",
outputDir + "/basic.ini");
QFile::copy(inputPath + currentProfile + "/service.json",
outputDir + "/service.json");
QFile::copy(inputPath + currentProfile + "/streamEncoder.json",
outputDir + "/streamEncoder.json");
QFile::copy(inputPath + currentProfile + "/recordEncoder.json",
outputDir + "/recordEncoder.json");
} else {
if (QFile::exists(outputDir + "/basic.ini"))
QFile::remove(outputDir + "/basic.ini");
if (QFile::exists(outputDir + "/service.json"))
QFile::remove(outputDir + "/service.json");
if (QFile::exists(outputDir + "/streamEncoder.json"))
QFile::remove(outputDir + "/streamEncoder.json");
if (QFile::exists(outputDir + "/recordEncoder.json"))
QFile::remove(outputDir + "/recordEncoder.json");
}
QFile::copy(inputPath + currentProfile + "/basic.ini",
outputDir + "/basic.ini");
QFile::copy(inputPath + currentProfile + "/service.json",
outputDir + "/service.json");
QFile::copy(inputPath + currentProfile + "/streamEncoder.json",
outputDir + "/streamEncoder.json");
QFile::copy(inputPath + currentProfile + "/recordEncoder.json",
outputDir + "/recordEncoder.json");
}
}

6
UI/window-basic-main-scene-collections.cpp
View File

@ -425,8 +425,12 @@ void OBSBasic::on_actionExportSceneCollection_triggered()
string file = QT_TO_UTF8(exportFile);
if (!exportFile.isEmpty() && !exportFile.isNull())
if (!exportFile.isEmpty() && !exportFile.isNull()) {
if (QFile::exists(exportFile))
QFile::remove(exportFile);
QFile::copy(path + currentFile + ".json", exportFile);
}
}
void OBSBasic::ChangeSceneCollection()