Fixed double plugin registration (if failed on property scanning)

KinectToVR · Feb 20, 2023 · c097cf0 · c097cf0
1 parent ed86237
commit c097cf0
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/Amethyst/MainWindow.xaml.cs b/Amethyst/MainWindow.xaml.cs
@@ -530,7 +530,7 @@ public MainWindow()
                         PluginType = TrackingDevices.PluginType.TrackingDevice,
                         Publisher = plugin.Metadata.Publisher,
                         Website = plugin.Metadata.Website,
-                        Error = e.Message,
+                        Error = $"{e.Message}\n\n{e.StackTrace}",
                         Status = TrackingDevices.PluginLoadError.Other
                     });
                 }
@@ -567,7 +567,7 @@ public MainWindow()
                     Logger.Info("Skipping this catalog part as it doesn't contain any usable plugins!");
                     continue; // Skip composing this plugin, it won't do any good!
                 }
-
+                
                 var plugin = devicePlugins.First();
                 Logger.Info($"Preparing exports for ({plugin.Metadata.Name}, {plugin.Metadata.Guid})...");
 
@@ -668,20 +668,6 @@ public MainWindow()
                     var pluginLocation = Assembly.GetAssembly(plugin.Value.GetType()).Location;
                     var pluginFolder = Directory.GetParent(pluginLocation).FullName;
 
-                    // Add the device to the 'attempted' list, mark as all fine
-                    Logger.Info($"Adding ({plugin.Metadata.Name}, {plugin.Metadata.Guid}) " +
-                                "to the load-attempted device plugins list (TrackingDevices)...");
-                    TrackingDevices.LoadAttemptedPluginsList.Add(new LoadAttemptedPlugin
-                    {
-                        Name = plugin.Metadata.Name,
-                        Guid = plugin.Metadata.Guid,
-                        PluginType = TrackingDevices.PluginType.ServiceEndpoint,
-                        Publisher = plugin.Metadata.Publisher,
-                        Website = plugin.Metadata.Website,
-                        Folder = pluginFolder,
-                        Status = TrackingDevices.PluginLoadError.NoError
-                    });
-
                     // Add the device to the global device list, add the plugin folder path
                     Logger.Info($"Adding ({plugin.Metadata.Name}, {plugin.Metadata.Guid}) " +
                                 "to the global service endpoints plugins list (TrackingDevices)...");
@@ -712,6 +698,20 @@ public MainWindow()
                                 $"- Supports Settings: {plugin.Value.IsSettingsDaemonSupported}\n" +
                                 $"- Additional Supported Trackers: {plugin.Value.AdditionalSupportedTrackerTypes.ToList()}");
 
+                    // Add the device to the 'attempted' list, mark as all fine
+                    Logger.Info($"Adding ({plugin.Metadata.Name}, {plugin.Metadata.Guid}) " +
+                                "to the load-attempted device plugins list (TrackingDevices)...");
+                    TrackingDevices.LoadAttemptedPluginsList.Add(new LoadAttemptedPlugin
+                    {
+                        Name = plugin.Metadata.Name,
+                        Guid = plugin.Metadata.Guid,
+                        PluginType = TrackingDevices.PluginType.ServiceEndpoint,
+                        Publisher = plugin.Metadata.Publisher,
+                        Website = plugin.Metadata.Website,
+                        Folder = pluginFolder,
+                        Status = TrackingDevices.PluginLoadError.NoError
+                    });
+
                     // Check if the loaded device is used as anything (AppData.Settings)
                     Logger.Info($"Checking if ({plugin.Metadata.Name}, {plugin.Metadata.Guid}) has any roles set...");
                     Logger.Info($"({plugin.Metadata.Name}, {plugin.Metadata.Guid}) " +
@@ -742,7 +742,7 @@ public MainWindow()
                         PluginType = TrackingDevices.PluginType.ServiceEndpoint,
                         Publisher = plugin.Metadata.Publisher,
                         Website = plugin.Metadata.Website,
-                        Error = e.Message,
+                        Error = $"{e.Message}\n\n{e.StackTrace}",
                         Status = TrackingDevices.PluginLoadError.Other
                     });
                 }