lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 22.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2018-12-16 17:14:58 +01:00
parent 665f64a933
commit cdc9a9fc87
334 changed files with 14525 additions and 2639 deletions
Download patch file Download diff file Expand all files Collapse all files

15
UI/window-basic-main-scene-collections.cpp
View file

@ -154,13 +154,19 @@ static bool GetSceneCollectionName(QWidget *parent, std::string &name,
return true;
}
void OBSBasic::AddSceneCollection(bool create_new)
bool OBSBasic::AddSceneCollection(bool create_new, const QString &qname)
{
std::string name;
std::string file;
if (!GetSceneCollectionName(this, name, file))
return;
if (qname.isEmpty()) {
if (!GetSceneCollectionName(this, name, file))
return false;
} else {
name = QT_TO_UTF8(qname);
if (SceneCollectionExists(name.c_str()))
return false;
}
SaveProjectNow();
@ -185,6 +191,8 @@ void OBSBasic::AddSceneCollection(bool create_new)
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED);
api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED);
}
return true;
}
void OBSBasic::RefreshSceneCollections()
@ -237,7 +245,6 @@ void OBSBasic::RefreshSceneCollections()
OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
main->OpenSavedProjectors();
main->ui->actionPasteFilters->setEnabled(false);
main->ui->actionPasteRef->setEnabled(false);
main->ui->actionPasteDup->setEnabled(false);