simplify shutdown check; reload files iff visible

Author: molsonkiko

NppNavigateTo/Forms/FrmNavigateTo.cs

@@ -108,10 +108,6 @@ void SearchInCurrentDirectory(string[] words)
 
         public void FilterDataGrid(string filter)
         {
-            // a bunch of NPPN_BUFFERACTIVATED events fire when Notepad++ is shutting down
-            // which will lead to this being called repeatedly
-            if (isShuttingDown)
-                return;
             if (!string.IsNullOrEmpty(searchComboBox.Text)) filter = searchComboBox.Text;
 
             if (!string.IsNullOrWhiteSpace(filter))
@@ -283,8 +279,6 @@ private void FilterMenuCommands(string[] filterWords)
 
         public void ReloadFileList()
         {
-            if (isShuttingDown)
-                return;
             if (FileList == null) FileList = new List<FileModel>();
             FileList.Clear();
             int firstViewCount =

NppNavigateTo/NppNavigateTo.cs

@@ -50,11 +50,8 @@ public static void OnNotification(ScNotification notification)
             switch (notification.Header.Code)
             {
                 case (uint)NppMsg.NPPN_BEFORESHUTDOWN:
-                var frmNavigateTo = NavigateTo.Plugin.Namespace.Main.frmNavigateTo;
-                if (frmNavigateTo == null)
-                    return;
-                frmNavigateTo.isShuttingDown = true;
-                break;
+                    NavigateTo.Plugin.Namespace.Main.isShuttingDown = true;
+                    break;
                 case (uint)NppMsg.NPPN_FILEOPENED:
                 case (uint)NppMsg.NPPN_FILECLOSED:
                 case (uint)NppMsg.NPPN_FILERENAMED:
@@ -66,10 +63,14 @@ public static void OnNotification(ScNotification notification)
                     // having a static unchanging editor object no longer works.
                     // this makes the editor track the current instance.
                     NavigateTo.Plugin.Namespace.Main.editor = new ScintillaGateway(PluginBase.GetCurrentScintilla());
-                    frmNavigateTo = NavigateTo.Plugin.Namespace.Main.frmNavigateTo;
-                    if (frmNavigateTo == null)
+                    var frmNavigateTo = NavigateTo.Plugin.Namespace.Main.frmNavigateTo;
+                    if (frmNavigateTo == null || NavigateTo.Plugin.Namespace.Main.isShuttingDown)
+                        // a bunch of NPPN_BUFFERACTIVATED events fire when Notepad++ is shutting down
+                        // which will lead to this being called repeatedly
                         return;
                     frmNavigateTo.shouldReloadFilesInDirectory = notification.Header.Code == (uint)NppMsg.NPPN_BUFFERACTIVATED;
+                    if (!frmNavigateTo.Visible)
+                        return;
                     frmNavigateTo.ReloadFileList();
                     frmNavigateTo.FilterDataGrid("");
                     break;
@@ -105,6 +106,7 @@ class Main
         static INotepadPPGateway notepad = new NotepadPPGateway();
         public static FrmNavigateTo frmNavigateTo = null;
         public static FrmSettings frmSettings = new FrmSettings(editor, notepad);
+        public static bool isShuttingDown = false;
 
         #endregion