WIP: Profile Matching

app/DD_Clipboard_Searcher/frmResultDoc.vb

@@ -64,8 +64,6 @@ Public Class frmResultDoc
 
         Dim oSearches = Await LoadSearchesAsync()
 
-        Await Task.Delay(1000) 'DEBUG
-
         For Each oSearch As DocSearch In oSearches
             RefreshTabDoc(oSearch.ProfileId, oSearch.DataTable, oSearch.TabIndex, oSearch.TabCaption)
         Next
@@ -73,6 +71,28 @@ Public Class frmResultDoc
         GridViewDocSearch1.HideLoadingPanel()
     End Sub
 
+    Private Sub frmResultDoc_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
+        Try
+            ConfigManager.Config.ResultDocWindowSize = Size
+            ConfigManager.Config.ResultDocWindowLocation = Location
+            ConfigManager.Save()
+        Catch ex As Exception
+            Logger.Error(ex)
+            Logger.Warn("Error in Save FormLayout: " & ex.Message)
+        End Try
+
+        _frmDocView?.Close()
+        _frmSQL?.Close()
+
+        If CURRENT_MATCHING_PROFILES.Count > 1 Then
+            _frmProfileMatch?.Show()
+            _frmProfileMatch?.BringToFront()
+        End If
+
+        CURR_MATCH_RESULT = Nothing
+        CLIPBOARD_TEXT = ""
+    End Sub
+
     Private Async Function LoadSearchesAsync() As Task(Of List(Of DocSearch))
         Return Await Task.Run(AddressOf DoLoadSearches)
     End Function
@@ -474,52 +494,6 @@ Public Class frmResultDoc
         Show_File_Properties()
     End Sub
 
-    Private Sub frmResultDoc_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
-        Try
-            ConfigManager.Config.ResultDocWindowSize = Size
-            ConfigManager.Config.ResultDocWindowLocation = Location
-            ConfigManager.Save()
-        Catch ex As Exception
-            Logger.Error(ex)
-            Logger.Info("Error in Save FormLayout: " & ex.Message)
-        End Try
-        Try
-            Dim frmCollection As New FormCollection()
-            frmCollection = Application.OpenForms()
-            Try
-                If frmCollection.Item("frmDocView").IsHandleCreated Then
-                    _frmDocView.Close()
-                End If
-            Catch ex As Exception
-
-            End Try
-
-            Try
-                If frmCollection.Item("frmResultSQL").IsHandleCreated Then
-                    frmResultSQL.Close()
-                End If
-            Catch ex As Exception
-
-            End Try
-
-            If frmCollection.Item("frmProfileMatch")?.IsHandleCreated Then
-                frmProfileMatch.Show()
-                frmProfileMatch.BringToFront()
-            End If
-        Catch ex As Exception
-            If Not IsNothing(CurrDT_PROFILE_MATCH) Then
-                If CurrDT_PROFILE_MATCH.Rows.Count > 1 Then
-                    _frmProfileMatch.Show()
-                    _frmProfileMatch.BringToFront()
-                    CURR_MATCH_RESULT = Nothing
-                    CLIPBOARD_TEXT = ""
-                End If
-
-            End If
-
-        End Try
-    End Sub
-
     Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click
         ReLoad_Active_DocTab()
     End Sub