From 94475f7bd1cf8da2df2714757ce87933f7393e64 Mon Sep 17 00:00:00 2001 From: Olatide F Date: Sun, 21 Mar 2021 09:17:41 -0400 Subject: [PATCH 1/3] update --- Torch/VRageGame.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs index b6d99c7..ab95642 100644 --- a/Torch/VRageGame.cs +++ b/Torch/VRageGame.cs @@ -183,7 +183,7 @@ namespace Torch "xyza7891A4WeGrpP85BTlBa3BSfUEABN", "ZdHZVevSVfIajebTnTmh5MVi3KPHflszD9hJB7mRkgg", "24b1cd652a18461fa9b3d533ac8d6b5b", "1958fe26c66d4151a327ec162e4d49c8", "07c169b3b641401496d352cad1c905d6", "https://retail.epicgames.com/", MyEOSService.CreatePlatform(), - MySandboxGame.ConfigDedicated.VerboseNetworkLogging, null, Enumerable.Empty(), null); + MySandboxGame.ConfigDedicated.VerboseNetworkLogging, null, Enumerable.Empty(), null,null); var mockingInventory = new MyMockingInventory(service); MyServiceManager.Instance.AddService(mockingInventory); From b846112c432cede368ee6ab7e816407feb1fe1e6 Mon Sep 17 00:00:00 2001 From: Olatide F Date: Fri, 3 Sep 2021 08:20:46 -0400 Subject: [PATCH 2/3] fix for the plugin browser crash --- Torch.Server/Views/PluginBrowser.xaml.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Torch.Server/Views/PluginBrowser.xaml.cs b/Torch.Server/Views/PluginBrowser.xaml.cs index 1e2707d..485d666 100644 --- a/Torch.Server/Views/PluginBrowser.xaml.cs +++ b/Torch.Server/Views/PluginBrowser.xaml.cs @@ -40,6 +40,7 @@ namespace Torch.Server.Views private string PreviousSearchQuery = ""; private string _description = "Loading data from server, please wait.."; + private static object _syncLock = new object(); public string CurrentDescription { get { return _description; } @@ -55,18 +56,21 @@ namespace Torch.Server.Views InitializeComponent(); var installedPlugins = pluginManager.Plugins; + BindingOperations.EnableCollectionSynchronization(Plugins,_syncLock); Task.Run(async () => { var res = await PluginQuery.Instance.QueryAll(); if (res == null) return; foreach (var item in res.Plugins.OrderBy(i => i.Name)) { - if (installedPlugins.Keys.Contains(Guid.Parse(item.ID))) - item.Installed = true; - - Plugins.Add(item); - PluginsList.Dispatcher.Invoke(() => PluginsList.SelectedIndex = 0); - PluginsSource.Add(item); + lock (_syncLock) + { + if (installedPlugins.Keys.Contains(Guid.Parse(item.ID))) + item.Installed = true; + Plugins.Add(item); + PluginsList.Dispatcher.Invoke(() => PluginsList.SelectedIndex = 0); + PluginsSource.Add(item); + } } CurrentDescription = "Please select a plugin..."; }); From 6c227b4a6ef0da59c72caab717e93daf1a8cc1b6 Mon Sep 17 00:00:00 2001 From: Olatide F Date: Fri, 3 Sep 2021 08:27:25 -0400 Subject: [PATCH 3/3] merge Friendly --- Versioning/AssemblyVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Versioning/AssemblyVersion.cs b/Versioning/AssemblyVersion.cs index 84a4129..c663bea 100644 --- a/Versioning/AssemblyVersion.cs +++ b/Versioning/AssemblyVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyInformationalVersion("v6.6.6-ElDiablo")] +[assembly: AssemblyInformationalVersion("v0.0.0-dev")]