MS Globix Integration 2

GUIs.ZooFlow/frmFlowForm.vb

@@ -236,11 +236,9 @@ Public Class frmFlowForm
         Next
 
     End Function
-    Private Function FormLoaded_Visible(ByVal pFormName As String) As Boolean
-
-
+    Private Function FormLoaded_Visible() As Boolean
         For Each frm As Form In Application.OpenForms
-            If frm.Name.Equals(pFormName) Then
+            If frm.Name.Equals("frmSearchStart") Or frm.Name.Equals("frmGlobix_Index") Then
                 Me.Visible = False
                 Exit Function
             End If
@@ -258,7 +256,7 @@ Public Class frmFlowForm
     End Sub
 
     Private Sub TimerCheckActiveForms_Tick(sender As Object, e As EventArgs) Handles TimerCheckActiveForms.Tick
-        FormLoaded_Visible("frmSearchStart")
+        FormLoaded_Visible()
         If Me.Visible = False Then Exit Sub
     End Sub
 
@@ -332,7 +330,7 @@ Public Class frmFlowForm
 
             Dim sql As String = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
             My.Application.Globix.DTACTUAL_FILES = Nothing
-            My.Application.Globix.DTACTUAL_FILES = My.Database.GetDatatable(sql, True)
+            My.Application.Globix.DTACTUAL_FILES = My.Database.GetDatatable(sql)
             My.Application.Globix.ABORT_INDEXING = False
 
             Dim oOnlyFilesFromFilesystem = True
@@ -362,18 +360,26 @@ Public Class frmFlowForm
             Show()
         Catch ex As Exception
             MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            Show()
         End Try
 
     End Sub
     Sub Globix_Open_IndexDialog()
         Try
-            Hide()
-            IndexForm.ShowDialog()
+
+            'Hide()
+
+            IndexForm = New frmGlobix_Index(My.LogConfig)
+            IndexForm.Show()
+            Cursor = Cursors.Default
+            If TimerCheckActiveForms.Enabled = False Then
+                TimerCheckActiveForms.Enabled = True
+            End If
         Catch ex As Exception
             Logger.Error(ex)
             MsgBox(ex.Message, MsgBoxStyle.Critical)
         Finally
-            Show()
+            ' Show()
         End Try
     End Sub
 End Class