Merge pull request #558 from hecon5/Fix553-NameInconsistency

Fix553 name inconsistency
joyfullservice · Jan 28, 2025 · 882179f · 882179f
2 parents ec39788 + 2b91894
commit 882179f
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 67 deletions.
diff --git a/Version Control.accda.src/dbs-properties.json b/Version Control.accda.src/dbs-properties.json
@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "4.0.38",
+      "Value": "4.0.39",
       "Type": 10
     },
     "Auto Compact": {

diff --git a/Version Control.accda.src/forms/frmVCSMain.cls b/Version Control.accda.src/forms/frmVCSMain.cls
@@ -187,17 +187,19 @@ End Sub
 ' Purpose   : Finish the build process
 '---------------------------------------------------------------------------------------
 '
-Public Sub FinishBuild(blnFullBuild As Boolean) 'Optional strType As String = "Build")
+Public Sub FinishBuild(blnFullBuild As Boolean _
+                        , Optional blnSuccess As Boolean = True)
 
-    Dim strType As String
+    Dim strMessage As String
 
     ' Turn on scroll bars in case the user wants to scroll back through the log.
     txtLog.ScrollBars = 2
 
     ' Display final UI messages.
     Log.Flush
-    SetStatusText T("Finished"), IIf(blnFullBuild, T("Build Complete"), T("Merge Complete")), _
-        T("Additional details can be found in the project log file.<br><br>You may now close this window.")
+    strMessage = T(IIf(blnFullBuild, "Build", "Merge")) & " " & T(IIf(blnSuccess, "Complete", "FAILED"))
+    SetStatusText T("Finished"), strMessage _
+        , T("Additional details can be found in the project log file.<br><br>You may now close this window.")
     cmdOpenLogFile.Visible = (Log.LogFilePath <> vbNullString)
     Me.strLastLogFilePath = Log.LogFilePath
 

diff --git a/Version Control.accda.src/modules/modFileAccess.bas b/Version Control.accda.src/modules/modFileAccess.bas
@@ -595,9 +595,9 @@ End Function
 ' Purpose   : Returns the UNC path for a network location (if applicable)
 '---------------------------------------------------------------------------------------
 '
-Public Function GetUNCPath(ByRef PathIn As String)
+Public Function GetUncPath(ByRef PathIn As String)
 
-    Const FunctionName As String = ModuleName & ".GetUNCPath"
+    Const FunctionName As String = ModuleName & ".GetUncPath"
     Dim DriveLetter As String
     Dim UNCPath As String
 
@@ -621,7 +621,7 @@ Retry:
             End If
         End If
     End With
-    GetUNCPath = UNCPath
+    GetUncPath = UNCPath
 
 Exit_Here:
     Perf.OperationEnd