Check for diff tool before comparing objects

josef-poetzl · Nov 8, 2023 · 925b019 · 925b019
1 parent 4f9247d
commit 925b019
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Version Control.accda.src/forms/frmVCSConflictList.bas b/Version Control.accda.src/forms/frmVCSConflictList.bas
@@ -16,10 +16,8 @@ Begin Form
     Width =5040
     DatasheetFontHeight =11
     ItemSuffix =31
-    Left =435
-    Top =2250
-    Right =12315
-    Bottom =7335
+    Right =15720
+    Bottom =11745
     RecSrcDt = Begin
         0x9bf1b7f2f3a6e540
     End
@@ -481,6 +479,13 @@ Private Sub txtDiff_Click()
     cboResolution.SetFocus
     DoEvents
 
+    ' Make sure we have a valid tool defined
+    If Not (modObjects.Diff.HasValidCompareTool) Then
+        MsgBox2 "No Compare Tool Defined", _
+            "Please specify a compare tool (i.e. WinMerge, VSCode) in the add-in options.", , vbExclamation
+        Exit Sub
+    End If
+
     ' Make sure we have a file name to compare
     strFileName = Nz(txtFileName)
     If strFileName = vbNullString Then

diff --git a/Version Control.accda.src/modules/clsViewDiff.cls b/Version Control.accda.src/modules/clsViewDiff.cls
@@ -219,7 +219,7 @@ End Function
 '           : valid for use.
 '---------------------------------------------------------------------------------------
 '
-Private Function HasValidCompareTool() As Boolean
+Public Function HasValidCompareTool() As Boolean
 
     ' Check the current option for compare tool.
     Select Case Me.ToolName