From da4f41bce3f1123ac8ebfbe31de435fc2cceefa8 Mon Sep 17 00:00:00 2001
From: Kostoski Stefan <kostoski.stefan90@gmail.com>
Date: Tue, 30 Jan 2024 14:58:47 +0100
Subject: [PATCH 1/4] Add auto-reload feature

---
 LiveSPICEVst/EditorView.xaml    |   7 ++-
 LiveSPICEVst/EditorView.xaml.cs | 100 +++++++++++++++++++++++++++++---
 2 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/LiveSPICEVst/EditorView.xaml b/LiveSPICEVst/EditorView.xaml
index 05defd33..7eaa9562 100644
--- a/LiveSPICEVst/EditorView.xaml
+++ b/LiveSPICEVst/EditorView.xaml
@@ -28,7 +28,10 @@
                     <TextBlock Margin="5,0,5,0">About</TextBlock>
                 </Button>
             </UniformGrid>
-            <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" HorizontalAlignment="Center" Margin="5" UseLayoutRounding="True">
+            <DockPanel DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="5">
+                <CheckBox x:Name="AutoReloadCheckBox" Content="Auto Reload" FlowDirection="RightToLeft" FontWeight="Bold" VerticalAlignment="Center" Click="AutoReloadCheckBox_Click"/>
+            </DockPanel>
+            <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" HorizontalAlignment="Center" Margin="5,0" UseLayoutRounding="True">
                 <StackPanel.Resources>
                     <Style TargetType="{x:Type TextBlock}">
                         <Setter Property="FontWeight" Value="Bold" />
@@ -52,7 +55,7 @@
                     <ComboBoxItem>32</ComboBoxItem>
                     <ComboBoxItem>64</ComboBoxItem>
                 </ComboBox>
-            </StackPanel>
+            </StackPanel>            
             <local:SimulationInterface DataContext="{Binding SimulationProcessor}" />
         </DockPanel>
     </Grid>
diff --git a/LiveSPICEVst/EditorView.xaml.cs b/LiveSPICEVst/EditorView.xaml.cs
index 705b6876..b786130b 100644
--- a/LiveSPICEVst/EditorView.xaml.cs
+++ b/LiveSPICEVst/EditorView.xaml.cs
@@ -1,6 +1,7 @@
 using Microsoft.Win32;
 using System;
 using System.IO;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -15,6 +16,9 @@ public partial class EditorView : UserControl
 
         SchematicWindow schematicWindow = null;
 
+        FileSystemWatcher loadedCircuitFileWatcher = null;
+        readonly SynchronizationContext uiThreadContext = null;
+
         public EditorView(LiveSPICEPlugin plugin)
         {
             this.Plugin = plugin;
@@ -23,6 +27,7 @@ public EditorView(LiveSPICEPlugin plugin)
             Plugin.EditorView = this;
 
             InitializeComponent();
+            uiThreadContext = SynchronizationContext.Current;
 
             UpdateSchematic();
         }
@@ -88,6 +93,8 @@ private void LoadCircuitButton_Click(object sender, RoutedEventArgs e)
                 Plugin.LoadSchematic(dialog.FileName);
 
                 UpdateSchematic();
+
+                AutoReloadSetup();
             }
         }
 
@@ -99,17 +106,9 @@ private void ShowAboutButton_Click(object sender, RoutedEventArgs e)
 
         private void ReloadCircuitButton_Click(object sender, RoutedEventArgs e)
         {
-            if (string.IsNullOrEmpty(Plugin.SchematicPath))
-            {
-                return;
-            }
-
-            Plugin.LoadSchematic(Plugin.SchematicPath);
-
-            UpdateSchematic();
+            ReloadCircuit();
         }
 
-
         private void ShowCircuitButton_Click(object sender, RoutedEventArgs e)
         {
             if (Plugin.SimulationProcessor.Schematic != null)
@@ -127,5 +126,88 @@ private void ShowCircuitButton_Click(object sender, RoutedEventArgs e)
                 schematicWindow.Activate();
             }
         }
+
+        private void ReloadCircuit()
+        {
+            if (string.IsNullOrEmpty(Plugin.SchematicPath))
+            {
+                return;
+            }
+
+            Plugin.LoadSchematic(Plugin.SchematicPath);
+
+            UpdateSchematic();
+        }
+
+        private void OnCircuitFileUpdated(object sender, FileSystemEventArgs e)
+        {
+            // The circuit file remains locked by the OS for a short period of time after writing.
+            // A workaround for this problem is to wait for a short amount of time and keep checking
+            // if the file has been unlocked, or if a timeout has occured
+            // The timeout time is calculated as follows: delay * numberOfRetries
+            // and it this case it is 50 * 20 = 1000 milliseconds or 1 second
+            const int delay = 50;
+            int numberOfRetries = 20;
+
+            while (numberOfRetries > 0)
+            {
+                try
+                {
+                    // If the file can be successfully opened,
+                    // it means that it's unlocked and the circuit can be reloaded
+                    FileStream circuitFile = File.Open(
+                        Plugin.SchematicPath, 
+                        FileMode.Open, 
+                        FileAccess.ReadWrite, 
+                        FileShare.None);
+
+                    circuitFile.Close();
+
+                    // The OnCircuitFileUpdated function is called a from a thread separate from the UI
+                    // and it cannot directly access the plugin data.
+                    // Therefore, the main UI thread should be notified to call the reload function.
+                    uiThreadContext.Send(x => ReloadCircuit(), null);
+                    return;
+                }
+                catch { }
+
+                Thread.Sleep(delay);
+                --numberOfRetries;
+            }
+        }
+
+        private void AutoReloadCheckBox_Click(object sender, RoutedEventArgs e)
+        {
+            AutoReloadSetup();
+        }
+
+        private void AutoReloadSetup()
+        {
+            // Dispose of the resources used by the file watcher (if needed) when the checkbox is unchecked
+            if (AutoReloadCheckBox.IsChecked == false)
+            {
+                loadedCircuitFileWatcher?.Dispose();
+                return;
+            }
+
+            // If a schematic is not loaded, there is no file to be watched
+            if (string.IsNullOrEmpty(Plugin.SchematicPath))
+            {
+                return;
+            }
+
+            // Create a new File System Watcher to watch for write events on the loaded schematic file
+            loadedCircuitFileWatcher = new FileSystemWatcher
+            {
+                Filter = Path.GetFileName(Plugin.SchematicPath),
+                Path = Path.GetDirectoryName(Plugin.SchematicPath),
+                NotifyFilter = NotifyFilters.LastWrite,
+                // EnableRaisingEvents has to be set last, otherwise it throws an error because the path is still empty
+                EnableRaisingEvents = true,
+            };
+
+            // Link a callback function to the file watcher that executes each time a new write operation occurs
+            loadedCircuitFileWatcher.Changed += OnCircuitFileUpdated;
+        }
     }
 }

From b32909a90730774f11e7a61c59c8599c98978590 Mon Sep 17 00:00:00 2001
From: Kostoski Stefan <kostoski.stefan90@gmail.com>
Date: Wed, 31 Jan 2024 11:03:30 +0100
Subject: [PATCH 2/4] Fix Auto-Reload nonoptimal file reload and implement
 rename listener

---
 Circuit/Schematic/Schematic.cs      | 11 +++++
 LiveSPICEVst/EditorView.xaml.cs     | 62 +++++++++++++++++++----------
 LiveSPICEVst/LiveSPICEPlugin.cs     | 13 ++++++
 LiveSPICEVst/SimulationProcessor.cs | 13 ++++++
 4 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/Circuit/Schematic/Schematic.cs b/Circuit/Schematic/Schematic.cs
index adb5ed68..fe512784 100644
--- a/Circuit/Schematic/Schematic.cs
+++ b/Circuit/Schematic/Schematic.cs
@@ -1,6 +1,7 @@
 using ComputerAlgebra;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Xml.Linq;
 using Util;
@@ -363,7 +364,17 @@ public static Schematic Load(string FileName, ILog Log)
             return S;
         }
 
+        public static Schematic Load(FileStream fileStream, ILog Log)
+        {
+            XDocument doc = XDocument.Load(fileStream);
+            Schematic S = Deserialize(doc.Root, Log);
+            Log.WriteLine(MessageType.Info, "Schematic loaded from '" + fileStream.Name + "'");
+            S.LogComponents();
+            return S;
+        }
+
         public static Schematic Load(string FileName) { return Load(FileName, new NullLog()); }
+        public static Schematic Load(FileStream fileStream) { return Load(fileStream, new NullLog()); }
 
         public XElement Serialize()
         {
diff --git a/LiveSPICEVst/EditorView.xaml.cs b/LiveSPICEVst/EditorView.xaml.cs
index b786130b..659ecab9 100644
--- a/LiveSPICEVst/EditorView.xaml.cs
+++ b/LiveSPICEVst/EditorView.xaml.cs
@@ -25,9 +25,9 @@ public EditorView(LiveSPICEPlugin plugin)
             this.DataContext = Plugin;
 
             Plugin.EditorView = this;
+            uiThreadContext = SynchronizationContext.Current;
 
             InitializeComponent();
-            uiThreadContext = SynchronizationContext.Current;
 
             UpdateSchematic();
         }
@@ -90,10 +90,7 @@ private void LoadCircuitButton_Click(object sender, RoutedEventArgs e)
 
             if (dialog.ShowDialog() == true)
             {
-                Plugin.LoadSchematic(dialog.FileName);
-
-                UpdateSchematic();
-
+                ReloadCircuit(dialog.FileName);
                 AutoReloadSetup();
             }
         }
@@ -106,7 +103,7 @@ private void ShowAboutButton_Click(object sender, RoutedEventArgs e)
 
         private void ReloadCircuitButton_Click(object sender, RoutedEventArgs e)
         {
-            ReloadCircuit();
+            ReloadCircuit(Plugin.SchematicPath);
         }
 
         private void ShowCircuitButton_Click(object sender, RoutedEventArgs e)
@@ -127,19 +124,28 @@ private void ShowCircuitButton_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void ReloadCircuit()
+        private void ReloadCircuit(string path)
         {
-            if (string.IsNullOrEmpty(Plugin.SchematicPath))
+            if (string.IsNullOrEmpty(path))
             {
                 return;
             }
 
-            Plugin.LoadSchematic(Plugin.SchematicPath);
+            Plugin.LoadSchematic(path);
+            UpdateSchematic();
+        }
+        private void ReloadCircuit(FileStream circuitFileStream)
+        {
+            if (circuitFileStream.Length == 0)
+            {
+                return;
+            }
 
+            Plugin.LoadSchematic(circuitFileStream);
             UpdateSchematic();
         }
 
-        private void OnCircuitFileUpdated(object sender, FileSystemEventArgs e)
+        private void OnCircuitFileChanged(object sender, FileSystemEventArgs e)
         {
             // The circuit file remains locked by the OS for a short period of time after writing.
             // A workaround for this problem is to wait for a short amount of time and keep checking
@@ -156,17 +162,17 @@ private void OnCircuitFileUpdated(object sender, FileSystemEventArgs e)
                     // If the file can be successfully opened,
                     // it means that it's unlocked and the circuit can be reloaded
                     FileStream circuitFile = File.Open(
-                        Plugin.SchematicPath, 
-                        FileMode.Open, 
-                        FileAccess.ReadWrite, 
+                        Plugin.SchematicPath,
+                        FileMode.Open,
+                        FileAccess.Read,
                         FileShare.None);
 
-                    circuitFile.Close();
-
-                    // The OnCircuitFileUpdated function is called a from a thread separate from the UI
+                    // The OnCircuitFileChanged function is called a from a thread separate from the UI
                     // and it cannot directly access the plugin data.
                     // Therefore, the main UI thread should be notified to call the reload function.
-                    uiThreadContext.Send(x => ReloadCircuit(), null);
+                    uiThreadContext.Send(x => ReloadCircuit(circuitFile), null);
+
+                    circuitFile.Close();
                     return;
                 }
                 catch { }
@@ -176,6 +182,20 @@ private void OnCircuitFileUpdated(object sender, FileSystemEventArgs e)
             }
         }
 
+        private void OnCircuitFileRenamed(object sender, FileSystemEventArgs e)
+        {
+            // The OnCircuitFileRenamed function is called a from a thread separate from the UI
+            // and it cannot directly access the plugin data.
+            // Therefore, the main UI thread should be notified to call the reload function.
+            uiThreadContext.Send(x => ReloadCircuit(e.FullPath), null);
+
+            // If the file was manually renamed (from file explorer), reinitialize the FileSystemWatcher with the new schematic path
+            if (e.FullPath != Plugin.SchematicPath)
+            {
+                uiThreadContext.Send(x => AutoReloadSetup(), null);
+            }
+        }
+
         private void AutoReloadCheckBox_Click(object sender, RoutedEventArgs e)
         {
             AutoReloadSetup();
@@ -201,13 +221,15 @@ private void AutoReloadSetup()
             {
                 Filter = Path.GetFileName(Plugin.SchematicPath),
                 Path = Path.GetDirectoryName(Plugin.SchematicPath),
-                NotifyFilter = NotifyFilters.LastWrite,
+                NotifyFilter = NotifyFilters.FileName| NotifyFilters.LastWrite,
                 // EnableRaisingEvents has to be set last, otherwise it throws an error because the path is still empty
                 EnableRaisingEvents = true,
             };
 
-            // Link a callback function to the file watcher that executes each time a new write operation occurs
-            loadedCircuitFileWatcher.Changed += OnCircuitFileUpdated;
+            // Link callback functions to the file watcher that executes each time a
+            // new write or rename operation occurs on the loaded schematic file
+            loadedCircuitFileWatcher.Renamed += OnCircuitFileRenamed;
+            loadedCircuitFileWatcher.Changed += OnCircuitFileChanged;
         }
     }
 }
diff --git a/LiveSPICEVst/LiveSPICEPlugin.cs b/LiveSPICEVst/LiveSPICEPlugin.cs
index 6c32491e..e54f9f50 100644
--- a/LiveSPICEVst/LiveSPICEPlugin.cs
+++ b/LiveSPICEVst/LiveSPICEPlugin.cs
@@ -190,6 +190,19 @@ public void LoadSchematic(string path)
                 MessageBox.Show(String.Format("Error loading schematic from: {0}\n\n{1}", path, ex.ToString()), "Schematic Load Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
+        public void LoadSchematic(FileStream schematicFileStream)
+        {
+            haveSimulationError = false;
+
+            try
+            {
+                SimulationProcessor.LoadSchematic(schematicFileStream);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(String.Format("Error loading schematic from: {0}\n\n{1}", schematicFileStream.Name, ex.ToString()), "Schematic Load Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
 
         public override void Process()
         {
diff --git a/LiveSPICEVst/SimulationProcessor.cs b/LiveSPICEVst/SimulationProcessor.cs
index 03d56442..b806b3dc 100644
--- a/LiveSPICEVst/SimulationProcessor.cs
+++ b/LiveSPICEVst/SimulationProcessor.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -98,6 +99,18 @@ public void LoadSchematic(string path)
 
             SchematicPath = path;
         }
+        public void LoadSchematic(FileStream schematicFileStream)
+        {
+            Schematic newSchematic = Circuit.Schematic.Load(schematicFileStream);
+
+            Circuit.Circuit circuit = newSchematic.Build();
+
+            SetCircuit(circuit);
+
+            Schematic = newSchematic;
+
+            SchematicPath = schematicFileStream.Name;
+        }
 
         public void ClearSchematic()
         {

From 7f92aa3f8cca07b067ce6093b5b17285ffe879c8 Mon Sep 17 00:00:00 2001
From: Kostoski Stefan <kostoski.stefan90@gmail.com>
Date: Wed, 31 Jan 2024 19:28:10 +0100
Subject: [PATCH 3/4] Remove redundant code

---
 Circuit/Schematic/Schematic.cs      | 11 -----
 LiveSPICEVst/EditorView.xaml.cs     | 62 ++++-------------------------
 LiveSPICEVst/LiveSPICEPlugin.cs     | 13 ------
 LiveSPICEVst/SimulationProcessor.cs | 13 ------
 4 files changed, 8 insertions(+), 91 deletions(-)

diff --git a/Circuit/Schematic/Schematic.cs b/Circuit/Schematic/Schematic.cs
index fe512784..adb5ed68 100644
--- a/Circuit/Schematic/Schematic.cs
+++ b/Circuit/Schematic/Schematic.cs
@@ -1,7 +1,6 @@
 using ComputerAlgebra;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Xml.Linq;
 using Util;
@@ -364,17 +363,7 @@ public static Schematic Load(string FileName, ILog Log)
             return S;
         }
 
-        public static Schematic Load(FileStream fileStream, ILog Log)
-        {
-            XDocument doc = XDocument.Load(fileStream);
-            Schematic S = Deserialize(doc.Root, Log);
-            Log.WriteLine(MessageType.Info, "Schematic loaded from '" + fileStream.Name + "'");
-            S.LogComponents();
-            return S;
-        }
-
         public static Schematic Load(string FileName) { return Load(FileName, new NullLog()); }
-        public static Schematic Load(FileStream fileStream) { return Load(fileStream, new NullLog()); }
 
         public XElement Serialize()
         {
diff --git a/LiveSPICEVst/EditorView.xaml.cs b/LiveSPICEVst/EditorView.xaml.cs
index 659ecab9..b6a855f6 100644
--- a/LiveSPICEVst/EditorView.xaml.cs
+++ b/LiveSPICEVst/EditorView.xaml.cs
@@ -134,57 +134,10 @@ private void ReloadCircuit(string path)
             Plugin.LoadSchematic(path);
             UpdateSchematic();
         }
-        private void ReloadCircuit(FileStream circuitFileStream)
-        {
-            if (circuitFileStream.Length == 0)
-            {
-                return;
-            }
-
-            Plugin.LoadSchematic(circuitFileStream);
-            UpdateSchematic();
-        }
-
-        private void OnCircuitFileChanged(object sender, FileSystemEventArgs e)
-        {
-            // The circuit file remains locked by the OS for a short period of time after writing.
-            // A workaround for this problem is to wait for a short amount of time and keep checking
-            // if the file has been unlocked, or if a timeout has occured
-            // The timeout time is calculated as follows: delay * numberOfRetries
-            // and it this case it is 50 * 20 = 1000 milliseconds or 1 second
-            const int delay = 50;
-            int numberOfRetries = 20;
-
-            while (numberOfRetries > 0)
-            {
-                try
-                {
-                    // If the file can be successfully opened,
-                    // it means that it's unlocked and the circuit can be reloaded
-                    FileStream circuitFile = File.Open(
-                        Plugin.SchematicPath,
-                        FileMode.Open,
-                        FileAccess.Read,
-                        FileShare.None);
-
-                    // The OnCircuitFileChanged function is called a from a thread separate from the UI
-                    // and it cannot directly access the plugin data.
-                    // Therefore, the main UI thread should be notified to call the reload function.
-                    uiThreadContext.Send(x => ReloadCircuit(circuitFile), null);
-
-                    circuitFile.Close();
-                    return;
-                }
-                catch { }
-
-                Thread.Sleep(delay);
-                --numberOfRetries;
-            }
-        }
 
-        private void OnCircuitFileRenamed(object sender, FileSystemEventArgs e)
+        private void OnCircuitFileUpdate(object sender, FileSystemEventArgs e)
         {
-            // The OnCircuitFileRenamed function is called a from a thread separate from the UI
+            // The OnCircuitFileUpdate function is called a from a thread separate from the UI
             // and it cannot directly access the plugin data.
             // Therefore, the main UI thread should be notified to call the reload function.
             uiThreadContext.Send(x => ReloadCircuit(e.FullPath), null);
@@ -221,15 +174,16 @@ private void AutoReloadSetup()
             {
                 Filter = Path.GetFileName(Plugin.SchematicPath),
                 Path = Path.GetDirectoryName(Plugin.SchematicPath),
-                NotifyFilter = NotifyFilters.FileName| NotifyFilters.LastWrite,
+                NotifyFilter = NotifyFilters.FileName,
                 // EnableRaisingEvents has to be set last, otherwise it throws an error because the path is still empty
                 EnableRaisingEvents = true,
             };
 
-            // Link callback functions to the file watcher that executes each time a
-            // new write or rename operation occurs on the loaded schematic file
-            loadedCircuitFileWatcher.Renamed += OnCircuitFileRenamed;
-            loadedCircuitFileWatcher.Changed += OnCircuitFileChanged;
+            // Link a callback function to the file watcher that executes
+            // each time a rename operation occurs on the loaded schematic file.
+            // A rename happens because whenever the schematic file is saved, it is firstly
+            // stored as a .temp file and after writing, the file is renamed to use the correct extension.
+            loadedCircuitFileWatcher.Renamed += OnCircuitFileUpdate;
         }
     }
 }
diff --git a/LiveSPICEVst/LiveSPICEPlugin.cs b/LiveSPICEVst/LiveSPICEPlugin.cs
index e54f9f50..6c32491e 100644
--- a/LiveSPICEVst/LiveSPICEPlugin.cs
+++ b/LiveSPICEVst/LiveSPICEPlugin.cs
@@ -190,19 +190,6 @@ public void LoadSchematic(string path)
                 MessageBox.Show(String.Format("Error loading schematic from: {0}\n\n{1}", path, ex.ToString()), "Schematic Load Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
-        public void LoadSchematic(FileStream schematicFileStream)
-        {
-            haveSimulationError = false;
-
-            try
-            {
-                SimulationProcessor.LoadSchematic(schematicFileStream);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(String.Format("Error loading schematic from: {0}\n\n{1}", schematicFileStream.Name, ex.ToString()), "Schematic Load Error", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
 
         public override void Process()
         {
diff --git a/LiveSPICEVst/SimulationProcessor.cs b/LiveSPICEVst/SimulationProcessor.cs
index b806b3dc..03d56442 100644
--- a/LiveSPICEVst/SimulationProcessor.cs
+++ b/LiveSPICEVst/SimulationProcessor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -99,18 +98,6 @@ public void LoadSchematic(string path)
 
             SchematicPath = path;
         }
-        public void LoadSchematic(FileStream schematicFileStream)
-        {
-            Schematic newSchematic = Circuit.Schematic.Load(schematicFileStream);
-
-            Circuit.Circuit circuit = newSchematic.Build();
-
-            SetCircuit(circuit);
-
-            Schematic = newSchematic;
-
-            SchematicPath = schematicFileStream.Name;
-        }
 
         public void ClearSchematic()
         {

From 10ae36987547908ded1a24c530534302ca0c426b Mon Sep 17 00:00:00 2001
From: Kostoski Stefan <kostoski.stefan90@gmail.com>
Date: Thu, 1 Feb 2024 15:35:19 +0100
Subject: [PATCH 4/4] Remove auto-reload on manual file rename and optimize
 code

---
 LiveSPICEVst/EditorView.xaml.cs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/LiveSPICEVst/EditorView.xaml.cs b/LiveSPICEVst/EditorView.xaml.cs
index b6a855f6..d68599e4 100644
--- a/LiveSPICEVst/EditorView.xaml.cs
+++ b/LiveSPICEVst/EditorView.xaml.cs
@@ -1,7 +1,6 @@
 using Microsoft.Win32;
 using System;
 using System.IO;
-using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -17,7 +16,6 @@ public partial class EditorView : UserControl
         SchematicWindow schematicWindow = null;
 
         FileSystemWatcher loadedCircuitFileWatcher = null;
-        readonly SynchronizationContext uiThreadContext = null;
 
         public EditorView(LiveSPICEPlugin plugin)
         {
@@ -25,7 +23,6 @@ public EditorView(LiveSPICEPlugin plugin)
             this.DataContext = Plugin;
 
             Plugin.EditorView = this;
-            uiThreadContext = SynchronizationContext.Current;
 
             InitializeComponent();
 
@@ -137,16 +134,15 @@ private void ReloadCircuit(string path)
 
         private void OnCircuitFileUpdate(object sender, FileSystemEventArgs e)
         {
-            // The OnCircuitFileUpdate function is called a from a thread separate from the UI
-            // and it cannot directly access the plugin data.
-            // Therefore, the main UI thread should be notified to call the reload function.
-            uiThreadContext.Send(x => ReloadCircuit(e.FullPath), null);
-
-            // If the file was manually renamed (from file explorer), reinitialize the FileSystemWatcher with the new schematic path
             if (e.FullPath != Plugin.SchematicPath)
             {
-                uiThreadContext.Send(x => AutoReloadSetup(), null);
+                return;
             }
+
+            // The OnCircuitFileUpdate function is called a from a thread separate from the UI
+            // and it cannot directly access the plugin data.
+            // Therefore, the main UI thread should be notified to call the reload function.
+            Dispatcher.Invoke(() => ReloadCircuit(Plugin.SchematicPath));
         }
 
         private void AutoReloadCheckBox_Click(object sender, RoutedEventArgs e)