From c752e7cace166f43bab3e905003acf645244f661 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 4 Apr 2016 22:40:30 -0400 Subject: [PATCH] Fixed a mismerge. (But I still need to figure out what I'm doing between SetAbsolutePath() and whatever I had before...) --- Sources/Engine/Base/Stream.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sources/Engine/Base/Stream.cpp b/Sources/Engine/Base/Stream.cpp index aacf459..d1ead10 100644 --- a/Sources/Engine/Base/Stream.cpp +++ b/Sources/Engine/Base/Stream.cpp @@ -1570,12 +1570,14 @@ INDEX ExpandFilePath(ULONG ulType, const CTFileName &fnmFile, CTFileName &fnmExp // do that fnmExpanded = _fnmApplicationPath+_fnmMod+fnmFileAbsolute; fnmExpanded.SetAbsolutePath(); + VerifyDirsExist(fnmExpanded.FileDir()); return EFP_FILE; // if should not write to mod dir } else { // write to base dir fnmExpanded = _fnmApplicationPath+fnmFileAbsolute; fnmExpanded.SetAbsolutePath(); + VerifyDirsExist(fnmExpanded.FileDir()); return EFP_FILE; }