MS_08.03

app/DD-Record-Organiser/frmMain.vb

@@ -23,9 +23,12 @@ Public Class frmMain
     End Sub
     Private Shared Sub Scan_TickHandler(sender As Object, e As EventArgs)
         Try
+
+
             Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", Environment.UserName)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1, "Load ScanFiles")
             If Not IsNothing(DT) Then
+                CURRENT_SCAN_TABLE = DT
                 If DT.Rows.Count > 0 Then
                     Dim open As Boolean = False
                     For Each form In My.Application.OpenForms
@@ -49,6 +52,9 @@ Public Class frmMain
                         frm.Show()
                     End If
                 End If
+                If DT.Rows.Count = 0 Then
+                    frmScanFiles.Close()
+                End If
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in Scan_TickHandler:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)