From 5487834ed02626cd4836b6e95488d8205b37ed47 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <hongtao_zhang@outlook.com>
Date: Mon, 25 Oct 2021 19:02:22 -0500
Subject: [PATCH] Add back field to avoid duplicate plugin control loading

---
 Flow.Launcher/SettingWindow.xaml           | 4 ++--
 Flow.Launcher/ViewModel/PluginViewModel.cs | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 8fc214da7..ac6138644 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -774,7 +774,7 @@
                                                         <Style TargetType="{x:Type Border}">
                                                             <Setter Property="Visibility" Value="Visible" />
                                                             <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding ElementName=SettingControl, Path=ActualHeight}" Value="0">
+                                                                <DataTrigger Binding="{Binding ElementName=PluginSettingControl, Path=ActualHeight}" Value="0">
                                                                     <Setter Property="Visibility" Value="Collapsed" />
                                                                     <Setter Property="BorderThickness" Value="0" />
                                                                     <Setter Property="Padding" Value="0" />
@@ -784,7 +784,7 @@
                                                     </Border.Style>
                                                 </Border>
                                                 <!--#endregion-->
-                                                <ContentControl x:Name="SettingControl" 
+                                                <ContentControl x:Name="PluginSettingControl" 
                                                         Content="{Binding SettingControl}"
                                                         Padding="1" Margin="0" VerticalAlignment="Stretch"
                                                         MaxWidth="750" MaxHeight="550">
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index 22dc34cfd..209198822 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -31,7 +31,8 @@ namespace Flow.Launcher.ViewModel
             set => PluginPair.Metadata.Disabled = !value;
         }
 
-        public Control SettingControl => PluginPair.Plugin is not ISettingProvider settingProvider ? new Control() : settingProvider.CreateSettingPanel();
+        private Control _settingControl;
+        public Control SettingControl => _settingControl ??= PluginPair.Plugin is not ISettingProvider settingProvider ? new Control() : settingProvider.CreateSettingPanel();
 
         public Visibility ActionKeywordsVisibility => PluginPair.Metadata.ActionKeywords.Count == 1 ? Visibility.Visible : Visibility.Collapsed;
         public string InitilizaTime => PluginPair.Metadata.InitTime + "ms";