MS 04.09.2015 1

app/DD-Record-Organiser/ClassControlCommands.vb

@@ -423,15 +423,21 @@
             If DeleteControlValues(CURRENT_CONTROL_ID) = True Then
                 If DeleteControlScreen(CURRENT_CONTROL_ID) = True Then
                     If ClassFunctionCommands.DeleteFunction(CURRENT_CONTROL_ID) = True Then
-                        Dim SQL = "DELETE FROM TBPMO_CONTROL WHERE GUID = " & CURRENT_CONTROL_ID
-
+                        Dim SQL = "DELETE FROM TBPMO_CONTROL_IMAGE WHERE CONTROL_ID = " & CURRENT_CONTROL_ID
                         If ClassDatabase.Execute_non_Query(SQL) = True Then
-                            Return True
+                            SQL = "DELETE FROM TBPMO_CONTROL WHERE GUID = " & CURRENT_CONTROL_ID
+                            If ClassDatabase.Execute_non_Query(SQL) = True Then
+                                Return True
+                            End If
                         Else
-                            Throw New Exception()
+                            Return False
                         End If
                     End If
+                Else
+                    Return False
                 End If
+            Else
+                Return False
             End If
 
         Catch ex As Exception
@@ -492,5 +498,16 @@
             Return False
         End Try
     End Function
+    Public Shared Function CTRL_EXISTSinPARENT(ctrlName As String, parent As Control) As Boolean
+        Dim bResult As Boolean = False
 
+        For Each elem As Control In parent.Controls
+            If elem.Name = ctrlName Then
+                bResult = True
+                Exit For
+            End If
+        Next
+
+        Return bResult
+    End Function
 End Class