Explorar o código

UI: Fix crash when creating scene collections with "unsafe" names

Scene collection names that are not considered "safe" by OBS Studio
get a changed JSON file name with incompatible characters replaced.

The refactored scene collection implementation uses the Load function to
either activate an existing scene collection or create a new one if it
does not exist.

The Load function however overwrote the scene collection name set in
the profile with its own variant based off the "safe" file name, which
created a mismatch with the code that created the collection data
model.

As the Load function is only called by ActivateSceneCollection (which
itself already sets the name and filename for the collection), removal
of this superfluous code in the Load function also fixes the issue.
PatTheMav hai 1 ano
pai
achega
b4137fa65a
Modificáronse 1 ficheiros con 0 adicións e 4 borrados
  1. 0 4
      UI/window-basic-main.cpp

+ 0 - 4
UI/window-basic-main.cpp

@@ -1246,10 +1246,6 @@ void OBSBasic::Load(const char *file, bool remigrate)
 			}
 		}
 
-		config_set_string(App()->GetUserConfig(), "Basic",
-				  "SceneCollection", name.c_str());
-		config_set_string(App()->GetUserConfig(), "Basic",
-				  "SceneCollectionFile", name.c_str());
 		blog(LOG_INFO, "No scene file found, creating default scene");
 
 		bool hasFirstRun = config_get_bool(App()->GetUserConfig(),