VFPX · Jimrnelson · Jan 7, 2025 · Jan 5, 2025 · Jan 7, 2025
diff --git a/Source/BuildGoFish.h b/Source/BuildGoFish.h
@@ -1,10 +1,10 @@
 	#DEFINE GOFISH_APP_NAME 'GoFish'
 	#DEFINE GOFISH_APP_FILE  'GoFish.app'
-	#DEFINE GOFISH_VERSION '7.1.39'
-	#DEFINE GOFISH_BUILDDATE 'December 27, 2024'
-	#DEFINE GOFISH_DBUILDDATE Date(2024,12, 27)
+	#DEFINE GOFISH_VERSION '7.1.40'
+	#DEFINE GOFISH_BUILDDATE 'January 07, 2025'
+	#DEFINE GOFISH_DBUILDDATE Date(2025,1, 7)
 	#DEFINE GOFISH_DOWNLOAD_URL 'https://raw.githubusercontent.com/VFPX/GoFish/master/Source/Source.zip'
-	#DEFINE GOFISH_VERSION_STRING_FOR_VERSION_FILE 'GoFish - 7.1.39 - December 27, 2024 - 20241227'
+	#DEFINE GOFISH_VERSION_STRING_FOR_VERSION_FILE 'GoFish - 7.1.40 - January 07, 2025 - 20250107'
 	#DEFINE THOR_TOOL_NAME	'Thor_Tool_GoFish'
 	#DEFINE VERSON_FILE_URL	'https://github.com/VFPX/GoFish/_GoFishVersionFile.txt'
 	#DEFINE VERSION_LOCAL_FILE 'GoFishVersionFile.txt'

diff --git a/Source/BuildNumber.txt b/Source/BuildNumber.txt
@@ -1 +1 @@
-39
+40
diff --git a/Source/GoFish.APP b/Source/GoFish.APP
diff --git a/Source/GoFish.pjt b/Source/GoFish.pjt
diff --git a/Source/GoFish.pjx b/Source/GoFish.pjx
diff --git a/Source/Lib/gofishsearchengine.prg b/Source/Lib/gofishsearchengine.prg
@@ -3179,60 +3179,54 @@ Result
 
 
 *----------------------------------------------------------------------------------
-	Procedure LoadOptions(tcFile)
-
-		Local;
-			lcProperty As String,;
-			loMy    As 'My' Of 'My.vcx'
-
-		Local Array;
-			laProperties(1)
-
-*:Global;
-x
-
-		If !File(m.tcFile)
+	Procedure LoadOptions(tcFile, tlInit)
+
+		Local lcProperty As String
+		Local loMy As 'My' Of 'My.vcx'
+		Local laProperties[1], lnI
+
+		If Not File(m.tcFile)
 			Return .F.
 		Endif
-
-*-- Get an array of properties that are on the SearchOptions object
+	
+		*-- Get an array of properties that are on the SearchOptions object
 		Amembers(laProperties, This.oSearchOptions, 0, 'U')
-
-*-- Load settings from file...
+	
+		*-- Load settings from file...
 		loMy = Newobject('My', 'My.vcx')
-		loMy.Settings.Load(m.tcFile)
-
-*--- Scan over Object properties, and look for a corresponding props on the My Settings object (if present)
+		m.loMy.Settings.Load(m.tcFile)
+	
+		*--- Scan over Object properties, and look for a corresponding props on the My Settings object (if present)
 		With m.loMy.Settings
-			For x = 1 To Alen(m.laProperties)
-				lcProperty = laProperties[x]
-				If Type('.' + m.lcProperty) <> 'U'
+			For lnI = 1 To Alen(m.laProperties)
+				lcProperty = m.laProperties[m.lnI]
+				If Type('.' + m.lcProperty) # 'U'
 					Store Evaluate('.' + m.lcProperty) To ('This.oSearchOptions.' + m.lcProperty)
 				Endif
 			Endfor
 		Endwith
-
-*-- My.Settings stores Dates as DateTimes, so I need to convert them to just Date datatypes
+	
+		*-- My.Settings stores Dates as DateTimes, so I need to convert them to just Date datatypes
 		Try
-				This.oSearchOptions.dTimeStampFrom = Ttod(This.oSearchOptions.dTimeStampFrom)
-			Catch
-				This.oSearchOptions.dTimeStampFrom = {}
+			This.oSearchOptions.dTimeStampFrom = Ttod(This.oSearchOptions.dTimeStampFrom)
+		Catch
+			This.oSearchOptions.dTimeStampFrom = {}
 		Endtry
-
+	
 		Try
-				This.oSearchOptions.dTimeStampTo = Ttod(This.oSearchOptions.dTimeStampTo)
-			Catch
-				This.oSearchOptions.dTimeStampTo = {}
-		EndTry
-		
-		If This.oSearchOptions.nSearchScope = 6 && Results
+			This.oSearchOptions.dTimeStampTo = Ttod(This.oSearchOptions.dTimeStampTo)
+		Catch
+			This.oSearchOptions.dTimeStampTo = {}
+		Endtry
+
+		If m.tlInit and This.oSearchOptions.nSearchScope = 6 && Results
 			This.oSearchOptions.nSearchScope = This.oSearchOptions.nPreviousSearchScope
-		EndIf 
-
+		Endif
+	
 		Return .T.
-
+	
 	Endproc
-
+	
 
 *----------------------------------------------------------------------------------
 	Procedure lReadyToReplace_Access

diff --git a/Source/Lib/gofishui.VCT b/Source/Lib/gofishui.VCT
diff --git a/Source/Lib/gofishui.gf_resultsform.vc2 b/Source/Lib/gofishui.gf_resultsform.vc2
diff --git a/Source/Lib/gofishui.vcx b/Source/Lib/gofishui.vcx
diff --git a/Source/Source.zip b/Source/Source.zip
diff --git a/_GoFishVersionFile.txt b/_GoFishVersionFile.txt
@@ -9,6 +9,17 @@ Text to lcNote NoShow
 
 ---
 
+## Version 7.1.40 - 2025-01-07
+
+Bug fix:
+- Problem with "class not found" error, caused by problems with "Set Procedure" adventures (#324)
+
+Minor UI changes:
+- When loading history
+    - Restores Scope setting 'Files in current Results'
+    - Restores count of matches (upper right corner) and files with matches
+- Correctly updates count of matches and files with matches when filtering the grid.
+
 ## Version 7.1.39 - 2024-12-27
 
 Extended definitions for project-related Scope settings when no projects satisfy the Scope criterion:
@@ -183,27 +194,14 @@ New options on "New in V7" page of Options screen:
 - Matches for search expressions ending with backslash, such as `C:\`,  not being found (#264)
 - Two additions to grid context menu:
     - DeleteMark
-    - Set Deleted
-- Selecting "Browse Project" or "Browse Directory" sets scope to last project/directory (instead of blank)
-
-## Version 7.1.13 - 2024-06-29
-
-- Matches to currency symbol(s) not being found (#261)
-
-## Version 7.1.12 - 2024-06-29
-
-- New option to select the font size used in comboboxes (search expression, scope, mode, etc) (#259)
-
-## Version 7.1.11 - 2024-06-18
-
-- New option to display th
+    - Se
 EndText
 
 * For GF, strip off links at top of change log
 lcNote = Substr(lcNote, At('--', lcNote))
 lcNote = Alltrim(lcNote, 1, ' ', '-', Chr(13), Chr(10)) 
 
-AddProperty(toUpdateInfo, 'AvailableVersion', 'GoFish - 7.1.39 - December 27, 2024 - 20241227')
+AddProperty(toUpdateInfo, 'AvailableVersion', 'GoFish - 7.1.40 - January 07, 2025 - 20250107')
 AddProperty(toUpdateInfo, 'SourceFileUrl', 'https://raw.githubusercontent.com/VFPX/GoFish/master/Source/Source.zip')
 AddProperty(toUpdateInfo, 'LinkPrompt', 'GoFish Home Page')
 AddProperty(toUpdateInfo, 'Link', 'https://github.com/VFPX/GoFish')

diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md
@@ -6,6 +6,17 @@
 
 ---
 
+## Version 7.1.40 - 2025-01-07
+
+Bug fix:
+- Problem with "class not found" error, caused by problems with "Set Procedure" adventures (#324)
+
+Minor UI changes:
+- When loading history
+    - Restores Scope setting 'Files in current Results'
+    - Restores count of matches (upper right corner) and files with matches 
+- Correctly updates count of matches and files with matches when filtering the grid.
+
 ## Version 7.1.39 - 2024-12-27
 
 Extended definitions for project-related Scope settings when no projects satisfy the Scope criterion: