RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
David Rose 2000-11-09 07:40:22 +00:00
parent ce89b324f1
commit a534f2b338
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dtool/src/dtoolutil/filename.cxx
View File

@ -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;
}