From a534f2b3381d6be6eee586a185799ca9c84ef663 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 9 Nov 2000 07:40:22 +0000 Subject: [PATCH] *** empty log message *** --- dtool/src/dtoolutil/filename.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dtool/src/dtoolutil/filename.cxx b/dtool/src/dtoolutil/filename.cxx index dbfade1af1..8ce0428892 100644 --- a/dtool/src/dtoolutil/filename.cxx +++ b/dtool/src/dtoolutil/filename.cxx @@ -169,7 +169,13 @@ convert_executable_pathname(const string &unix_style_pathname) { //////////////////////////////////////////////////////////////////// Filename:: Filename(const Filename &dirname, const Filename &basename) { - (*this) = dirname.get_fullpath() + "/" + basename.get_fullpath(); + if (dirname.empty()) { + (*this) = basename; + } else if (basename.empty()) { + (*this) = dirname; + } else { + (*this) = dirname.get_fullpath() + "/" + basename.get_fullpath(); + } _flags = 0; }