Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
a534f2b338
1 changed files with 7 additions and 1 deletions
  1. 7 1
      dtool/src/dtoolutil/filename.cxx

+ 7 - 1
dtool/src/dtoolutil/filename.cxx

@@ -169,7 +169,13 @@ convert_executable_pathname(const string &unix_style_pathname) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 Filename::
 Filename::
 Filename(const Filename &dirname, const Filename &basename) {
 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;
   _flags = 0;
 }
 }