ms

app/DD-Record-Organizer/frmMain.vb

@@ -40,11 +40,11 @@ Public Class frmMain
     End Sub
     Private Shared Sub Scan_TickHandler(sender As Object, e As EventArgs)
         Try
-            Dim DT As DataTable = ClassFolderWatcher.Check_Scan_Files
-            If Not IsNothing(DT) Then
-                CURRENT_SCAN_TABLE = DT
-                If DT.Rows.Count > 0 Then
-                    Dim open As Boolean = False
+            If ClassFolderWatcher.NEW_FILES = False Then Exit Sub
+            ClassFolderWatcher.Check_Scan_Files()
+            Dim open As Boolean = False
+            If Not IsNothing(CURRENT_SCAN_TABLE) Then
+                If CURRENT_SCAN_TABLE.Rows.Count > 0 Then
                     For Each form In My.Application.OpenForms
                         If (form.name = frmScanFiles.Name) Then
                             'form is loaded so can do work 
@@ -66,9 +66,10 @@ Public Class frmMain
                         frm.Show()
                     End If
                 End If
-                If DT.Rows.Count = 0 Then
+                If CURRENT_SCAN_TABLE.Rows.Count = 0 And open = True Then
                     frmScanFiles.Close()
                 End If
+                ClassFolderWatcher.NEW_FILES = False
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in Scan_TickHandler:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -649,8 +650,14 @@ Public Class frmMain
         End If
         If CONNECTION_CHANGED = True Then
             ' Den User neu laden, damit MenuItems korrekt geladen werden können
-            ClassInit.InitUserLogin()
-            Load_Connection_Dep_Data()
+            If ClassInit.InitDatabase = True Then
+                ClassInit.InitUserLogin()
+                Load_Connection_Dep_Data()
+            Else
+                MsgBox("Unexpected Error when new Initialize Database!", MsgBoxStyle.Critical)
+            End If
+
+
         End If
         If Task_Popup_minutes <> 0 Then
             TimerTasks.Stop()