From da64ccf87ff8e8965d60c3056c46648911c55822 Mon Sep 17 00:00:00 2001 From: Rye Mutt Date: Tue, 27 Apr 2021 15:11:03 -0400 Subject: [PATCH] Revert file path construction behavior to not strip forward slashes from prefix so it can be utilized to change output directory --- Source/EmberCommon/EmberCommon.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/EmberCommon/EmberCommon.h b/Source/EmberCommon/EmberCommon.h index 92c14da..c58bad6 100644 --- a/Source/EmberCommon/EmberCommon.h +++ b/Source/EmberCommon/EmberCommon.h @@ -347,13 +347,13 @@ static string MakeSingleFilename(const string& path, const string& out, const st } else if (useFinalName) { - filename = path + CleanPath(prefix + finalName + suffix + "." + format); + filename = path + prefix + CleanPath(finalName + suffix + "." + format); } else { ostringstream fnstream; - fnstream << prefix << setfill('0') << setprecision(0) << fixed << setw(padding) << i << suffix << "." << format; - filename = path + CleanPath(fnstream.str()); + fnstream << setfill('0') << setprecision(0) << fixed << setw(padding) << i << suffix << "." << format; + filename = path + prefix + CleanPath(fnstream.str()); } return filename; @@ -371,8 +371,8 @@ static string MakeSingleFilename(const string& path, const string& out, const st static string MakeAnimFilename(const string& path, const string& prefix, const string& suffix, const string& format, glm::uint padding, size_t ftime) { ostringstream fnstream; - fnstream << prefix << setfill('0') << setprecision(0) << fixed << setw(padding) << ftime << suffix << format; - return path + CleanPath(fnstream.str()); + fnstream << setfill('0') << setprecision(0) << fixed << setw(padding) << ftime << suffix << format; + return path + prefix + CleanPath(fnstream.str()); } ///