summaryrefslogtreecommitdiff
path: root/zen/file_path.cpp
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-08-03 12:51:45 +0000
committerB. Stack <bgstack15@gmail.com>2022-08-03 12:51:45 +0000
commit3f91181f8458cb6a6d95e25123db874875f7b259 (patch)
treec36c0f0c5fab7aa60432e9e1d32ba5fdfabeb55e /zen/file_path.cpp
parentMerge branch '11.22' into 'master' (diff)
parentadd upstream 11.23 (diff)
downloadFreeFileSync-3f91181f8458cb6a6d95e25123db874875f7b259.tar.gz
FreeFileSync-3f91181f8458cb6a6d95e25123db874875f7b259.tar.bz2
FreeFileSync-3f91181f8458cb6a6d95e25123db874875f7b259.zip
Merge branch 'b11.23' into 'master'11.23
add upstream 11.23 See merge request opensource-tracking/FreeFileSync!46
Diffstat (limited to 'zen/file_path.cpp')
-rw-r--r--zen/file_path.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/zen/file_path.cpp b/zen/file_path.cpp
index 68137b90..716dd8de 100644
--- a/zen/file_path.cpp
+++ b/zen/file_path.cpp
@@ -100,6 +100,7 @@ Zstring zen::appendPath(const Zstring& basePath, const Zstring& relPath)
if (relPath.empty())
return basePath; //with or without path separator, e.g. C:\ or C:\folder
+ //assert(!basePath.empty());
if (basePath.empty()) //basePath might be a relative path, too!
return relPath;
bgstack15