diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb index c9d67c4a..a5335837 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb @@ -56,7 +56,6 @@ Public Class ClassFilehandle 'Dim oBoxOptions = MsgBoxStyle.Question Or MsgBoxStyle.YesNo ofrmDuplicate.ShowDialog() - If ofrmDuplicate.DialogResult = DialogResult.Yes Then Return True End If diff --git a/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb b/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb index 51da2641..6d6291b1 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb @@ -52,7 +52,8 @@ Public Class ClassUserFiles oHash = "" End Try - oSQL = "SELECT * FROM TBIDB_FILE_OBJECT WHERE FILE_HASH = '" & oHash & "' ORDER BY ADDED_WHEN" + oSQL = $"SELECT A.* FROM TBIDB_FILE_OBJECT A INNER JOIN TBIDB_OBJECT B ON A.IDB_OBJ_ID = B.IDB_OBJ_ID + WHERE A.FILE_HASH = '{oHash}' AND B.DELETED = 0 ORDER BY A.ADDED_WHEN" Dim oResult As DataTable = My.DatabaseECM.GetDatatable(oSQL) If oResult.Rows.Count = 0 Then