Revert "Fixed ThrowIfNotOnUIThread exception (see #163)"

This reverts commit 2ac8e16.
MBulli · Apr 3, 2024 · c721d84 · c721d84
1 parent a618b2a
commit c721d84
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/SmartCmdArgs/SmartCmdArgs.Shared/CmdArgsPackage.cs b/SmartCmdArgs/SmartCmdArgs.Shared/CmdArgsPackage.cs
@@ -167,7 +167,7 @@ private ServiceProvider ConfigureServices()
             var services = new ServiceCollection();
 
             services.AddSingleton<Commands>();
-            services.AddSingleton(x => GetDialogPage<CmdArgsOptionPage>());
+            services.AddLazySingleton(x => GetDialogPage<CmdArgsOptionPage>());
             services.AddLazySingleton<SettingsViewModel>();
             services.AddLazySingleton<ToolWindowViewModel>();
             services.AddLazySingleton<TreeViewModel>();

diff --git a/SmartCmdArgs/SmartCmdArgs.Shared/Services/OptionsSettingsService.cs b/SmartCmdArgs/SmartCmdArgs.Shared/Services/OptionsSettingsService.cs
@@ -38,19 +38,19 @@ internal class OptionsSettingsService : PropertyChangedBase, IOptionsSettingsSer
     {
         private readonly IVisualStudioHelperService _vsHelperService;
         private readonly SettingsViewModel settingsViewModel;
-        private readonly CmdArgsOptionPage optionPage;
+        private readonly Lazy<CmdArgsOptionPage> lazyOptionsPage;
 
         public OptionsSettingsService(
             IVisualStudioHelperService vsHelperService,
             SettingsViewModel settingsViewModel,
-            CmdArgsOptionPage optionPage)
+            Lazy<CmdArgsOptionPage> lazyOptionsPage)
         {
             _vsHelperService = vsHelperService;
             this.settingsViewModel = settingsViewModel;
-            this.optionPage = optionPage;
+            this.lazyOptionsPage = lazyOptionsPage;
         }
 
-        private CmdArgsOptionPage OptionsPage => optionPage;
+        private CmdArgsOptionPage OptionsPage => lazyOptionsPage.Value;
 
         // Settings (possibly with options default)
         public bool SaveSettingsToJson => settingsViewModel.SaveSettingsToJson;

diff --git a/SmartCmdArgs/SmartCmdArgs.Shared/ViewModel/SettingsViewModel.cs b/SmartCmdArgs/SmartCmdArgs.Shared/ViewModel/SettingsViewModel.cs
@@ -8,7 +8,7 @@ namespace SmartCmdArgs.ViewModel
 {
     public class SettingsViewModel : PropertyChangedBase
     {
-        private readonly CmdArgsOptionPage optionPage;
+        private readonly Lazy<CmdArgsOptionPage> optionPage;
         private readonly Lazy<ILifeCycleService> lifeCycleService;
         private bool _saveSettingsToJson;
         private bool? _manageCommandLineArgs;
@@ -83,13 +83,13 @@ public bool? MacroEvaluationEnabled
 
         public RelayCommand DisableExtensionCommand { get; }
 
-        public CmdArgsOptionPage Options => optionPage;
+        public CmdArgsOptionPage Options => optionPage.Value;
         public ILifeCycleService LifeCycle => lifeCycleService.Value;
 
         public RelayCommand OpenOptionsCommand { get; }
 
         public SettingsViewModel(
-            CmdArgsOptionPage optionPage,
+            Lazy<CmdArgsOptionPage> optionPage,
             Lazy<ILifeCycleService> lifeCycleService)
         {
             this.optionPage = optionPage;