fix SceneSourceSelector (OBS5), lost credentials

RecklessBoon · Jan 5, 2023 · 96757a8 · 96757a8
1 parent 84967a4
commit 96757a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/GUI/PluginConfig.cs b/GUI/PluginConfig.cs
@@ -40,7 +40,7 @@ public PluginConfig()
             {
                 credentials = credentialsList[0];
             }
-            if (credentials != null)
+            if (credentials != null && credentials.ContainsKey("host") && credentials.ContainsKey("password"))
             {
                 this.host.Text = credentials["host"];
                 this.password.Text = credentials["password"];
@@ -50,7 +50,7 @@ public PluginConfig()
                 this.host.Text = "ws://127.0.0.1:4455";
             }
 
-            var versionTypeFound = Enum.TryParse<OBSWebSocketVersionType>(PluginConfiguration.GetValue(PluginInstance.Main, "versionType"), out OBSWebSocketVersionType versionType);
+            var versionTypeFound = Enum.TryParse(PluginConfiguration.GetValue(PluginInstance.Main, "versionType"), out OBSWebSocketVersionType versionType);
             SetVersionTypeSelected(versionTypeFound ? versionType : OBSWebSocketVersionType.OBS_WEBSOCKET_AUTO);
 
             var timeoutFound = int.TryParse(PluginConfiguration.GetValue(PluginInstance.Main, "timeout"), out int timeout);

diff --git a/GUI/SceneSourceSelector.cs b/GUI/SceneSourceSelector.cs
@@ -131,15 +131,16 @@ private void LoadSources()
             else
             {
                 var self = this;
+                var sceneName = scenesBox.Text;
                 _ = Task.Run(async () =>
                 {
-                    var response = await PluginInstance.Main.OBS5.SceneItemsRequests.GetSceneItemListAsync(scenesBox.Text);
+                    var response = await PluginInstance.Main.OBS5.SceneItemsRequests.GetSceneItemListAsync(sceneName);
                     if (response != null)
                     {
                         foreach (JObject sceneItem in response.SceneItems)
                         {
                             var name = sceneItem["sourceName"]?.ToString();
-                            if (!String.IsNullOrEmpty(name))
+                            if (!string.IsNullOrEmpty(name))
                             {
                                 sourcesBox.Invoke((MethodInvoker)delegate { sourcesBox.Items.Add(name); });
                             }