X-Git-Url: https://sfsrealm.hopto.org/projects/gitweb.cgi?p=WinMPQ.git;a=blobdiff_plain;f=FileDialog.bas;h=d097eaf571f27611133c11a2e86029c7fa1954fa;hp=7701ef9f343e1b2352f929c79520c2b774c4d223;hb=62046253535cb1df0280f7e331d2f76b0fbf2d17;hpb=0d212c7b54d46d8265497f927fd02716f5311e95

diff --git a/FileDialog.bas b/FileDialog.bas
index 7701ef9..d097eaf 100644
--- a/FileDialog.bas
+++ b/FileDialog.bas
@@ -107,6 +107,13 @@ For cNum = 1 To Len(TextStr)
 Next cNum
 End Sub
 Sub StripNull(ByRef TextStr As String)
+Dim cNum As Long
+cNum = InStr(1, TextStr, Chr$(0))
+If cNum Then
+    TextStr = Left(TextStr, cNum - 1)
+End If
+End Sub
+Sub StripNullMulti(ByRef TextStr As String)
 Dim cNum As Long, cNum2 As Long
 For cNum = 1 To Len(TextStr)
     cNum2 = InStr(cNum, TextStr, Chr$(0))
@@ -165,8 +172,13 @@ If Len(lpFileDialog.FileTitle) <= lpFileDialog.MaxFileTitleSize Then _
 ShowOpen = GetOpenFileName(lpFileDialog)
 lpFileDialog.Filter = Left$(lpFileDialog.Filter, Len(lpFileDialog.Filter) - 1)
 ReplaceChar lpFileDialog.Filter, Chr$(0), "|"
-StripNull lpFileDialog.FileName
-StripNull lpFileDialog.FileTitle
+If lpFileDialog.Flags And (OFN_ALLOWMULTISELECT Or OFN_EXPLORER) Then
+    StripNullMulti lpFileDialog.FileName
+    StripNullMulti lpFileDialog.FileTitle
+Else
+    StripNull lpFileDialog.FileName
+    StripNull lpFileDialog.FileTitle
+End If
 End Function
 Function ShowSave(ByRef lpFileDialog As OPENFILENAME) As Boolean
 lpFileDialog.lStructSize = Len(lpFileDialog)