MS

app/VERSION_CHECKER/ClassInit.vb

@@ -31,7 +31,6 @@ Public Class ClassInit
     End Function
     Public Sub InitBasics()
         Try
-            Dim UPDATE_ID As Integer
             If InitInstallPath() = False Then
 
             End If
@@ -48,6 +47,7 @@ Public Class ClassInit
                     VERSION_SERVER = DT_UPDATE.Rows(0).Item("VERSION_NO")
                     FORCE_UPDATE = DT_UPDATE.Rows(0).Item("FORCE_UPD")
                     VERSIONS_FOR_FORCE_UPDATE = DT_UPDATE.Rows(0).Item("VERSION_FORCE_UPD")
+                    ALL_USERS = DT_UPDATE.Rows(0).Item("ALL_USERS")
                     sql = String.Format("SELECT * FROM TBDD_VERSION_ITEMS WHERE UPDATE_ID = {0} ORDER BY GUID", UPDATE_ID)
                     DT_UPDATE_ITEMS = clsDatabase.Return_Datatable(sql)
                 End If
@@ -120,7 +120,6 @@ Public Class ClassInit
                     Return False
                 End If
             End If
-
         Catch ex As Exception
             ClassLogger.Add("Unexpected Error in InitInstallPath: " & ex.Message, True)
             Return False
@@ -131,19 +130,22 @@ Public Class ClassInit
         Dim f As String
         Try
             For Each d In Directory.GetDirectories(sDir)
-                If RecExe_found = False Then
-                    For Each f In Directory.GetFiles(d, "DD-Record-Organizer.exe")
-                        RecExe_found = True
-                        MY_INSTALL_PATH = Path.GetDirectoryName(f)
-                        Exit Sub
-                    Next
-                End If
-                If RecExe_found = False Then
-                    DirSearch(d)
+                If d.Contains("$Recycle") = False Or d.Contains("System Volume") = False Then
+                    If RecExe_found = False Then
+                        For Each f In Directory.GetFiles(d, "DD-Record-Organizer.exe")
+                            RecExe_found = True
+                            MY_INSTALL_PATH = Path.GetDirectoryName(f)
+                            Exit Sub
+                        Next
+                    End If
+                    If RecExe_found = False Then
+                        DirSearch(d)
+                    End If
                 End If
             Next
         Catch excpt As System.Exception
             ClassLogger.Add("Unexpected Error in DirSearch: " & excpt.Message, True)
+            MY_INSTALL_PATH = ""
         End Try
     End Sub
     Public Shared Function InsertEssential_Log(REFERENCE_KEY As Integer, REFERENCE_STRING As String, COMMENT As String)