New upstream version 23.2.1+dfsg1

This commit is contained in:
Simon Chopin 2019-07-27 14:47:10 +02:00
parent cdc9a9fc87
commit b14f9eae6d
1017 changed files with 37232 additions and 11111 deletions

View file

@ -114,13 +114,13 @@ static bool GetSceneCollectionName(QWidget *parent, std::string &name,
return false;
}
if (name.empty()) {
OBSMessageBox::information(parent,
OBSMessageBox::warning(parent,
QTStr("NoNameEntered.Title"),
QTStr("NoNameEntered.Text"));
continue;
}
if (SceneCollectionExists(name.c_str())) {
OBSMessageBox::information(parent,
OBSMessageBox::warning(parent,
QTStr("NameExists.Title"),
QTStr("NameExists.Text"));
continue;
@ -439,6 +439,8 @@ void OBSBasic::on_actionImportSceneCollection_triggered()
void OBSBasic::on_actionExportSceneCollection_triggered()
{
SaveProjectNow();
char path[512];
QString home = QDir::homePath();