Fixed: Opening Resourc file on Designer

XusinboyBekchanov · Aug 28, 2022 · efc55e6 · efc55e6
1 parent 9712731
commit efc55e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/TabWindow.bas b/src/TabWindow.bas
@@ -4594,7 +4594,11 @@ Function GetResNamePath(ByRef ResName As WString, ByRef ResourceFile As WString)
 		Return FilePath
 	Else
 		Var Fn = FreeFile_
-		If Open(ResourceFile For Input Encoding "utf-8" As #Fn) = 0 Then
+		Var Result = Open(ResourceFile For Input Encoding "utf-8" As #Fn)
+		If Result <> 0 Then Result = Open(ResourceFile For Input Encoding "utf-32" As #Fn)
+		If Result <> 0 Then Result = Open(ResourceFile For Input Encoding "utf-16" As #Fn)
+		If Result <> 0 Then Result = Open(ResourceFile For Input As #Fn)
+		If Result = 0 Then
 			Dim As WString * 1024 sLine
 			Dim As Integer Pos1
 			Dim As String Image

diff --git a/src/frmImageManager.frm b/src/frmImageManager.frm
@@ -290,8 +290,12 @@ Private Sub frmImageManager.Form_Show(ByRef Sender As Form)
 	If FolderName = "" Then ExeFileName = IIf(FolderName = "", ExePath & Slash & "Projects" & Slash, FolderName) & ExeFileName
 	Dim As Dictionary ResNamePaths
 	If CurrentImageList = 0 Then
-		Var Fn = FreeFile_, Pos1 = 0
-		If Open(ResourceFile For Input Encoding "utf-8" As #Fn) = 0 Then
+		Var Fn = FreeFile_, Pos1 = 0, Result = 0
+		Result = Open(ResourceFile For Input Encoding "utf-8" As #Fn)
+		If Result <> 0 Then Result = Open(ResourceFile For Input Encoding "utf-32" As #Fn)
+		If Result <> 0 Then Result = Open(ResourceFile For Input Encoding "utf-16" As #Fn)
+		If Result <> 0 Then Result = Open(ResourceFile For Input As #Fn)
+		If Result = 0 Then
 			Dim As WString * 1024 FilePath
 			Dim As WString * 1024 sLine
 			Dim As String Image