Browse Source

UI: If scene/source names exist, start from 2

Currently if you have a scene, "Scene" for example, and you create a new
scene, the dialog will pop up with a default name, but it'll start with
"Scene 1" instead of "Scene 2".  Same thing occurs with sources.  This
fixes that to start from 2 instead.
jp9000 8 years ago
parent
commit
133fa04db3
2 changed files with 2 additions and 2 deletions
  1. 1 1
      UI/window-basic-main.cpp
  2. 1 1
      UI/window-basic-source-select.cpp

+ 1 - 1
UI/window-basic-main.cpp

@@ -3051,7 +3051,7 @@ void OBSBasic::on_actionAddScene_triggered()
 	string name;
 	string name;
 	QString format{QTStr("Basic.Main.DefaultSceneName.Text")};
 	QString format{QTStr("Basic.Main.DefaultSceneName.Text")};
 
 
-	int i = 1;
+	int i = 2;
 	QString placeHolderText = format.arg(i);
 	QString placeHolderText = format.arg(i);
 	obs_source_t *source = nullptr;
 	obs_source_t *source = nullptr;
 	while ((source = obs_get_source_by_name(QT_TO_UTF8(placeHolderText)))) {
 	while ((source = obs_get_source_by_name(QT_TO_UTF8(placeHolderText)))) {

+ 1 - 1
UI/window-basic-source-select.cpp

@@ -204,7 +204,7 @@ OBSBasicSourceSelect::OBSBasicSourceSelect(OBSBasic *parent, const char *id_)
 	QString placeHolderText{QT_UTF8(GetSourceDisplayName(id))};
 	QString placeHolderText{QT_UTF8(GetSourceDisplayName(id))};
 
 
 	QString text{placeHolderText};
 	QString text{placeHolderText};
-	int i = 1;
+	int i = 2;
 	obs_source_t *source = nullptr;
 	obs_source_t *source = nullptr;
 	while ((source = obs_get_source_by_name(QT_TO_UTF8(text)))) {
 	while ((source = obs_get_source_by_name(QT_TO_UTF8(text)))) {
 		obs_source_release(source);
 		obs_source_release(source);