mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 18:31:55 -04:00
specify cwd before vfs-mount
This commit is contained in:
parent
41bbc4fa10
commit
fed924dab0
@ -446,6 +446,9 @@ get_global_ptr() {
|
|||||||
// mount.
|
// mount.
|
||||||
_global_ptr->mount("/", "/", 0);
|
_global_ptr->mount("/", "/", 0);
|
||||||
|
|
||||||
|
// And our initial cwd comes from the environment.
|
||||||
|
_global_ptr->chdir(ExecutionEnvironment::get_cwd());
|
||||||
|
|
||||||
// Then, we add whatever mounts are listed in the Configrc file.
|
// Then, we add whatever mounts are listed in the Configrc file.
|
||||||
Config::ConfigTable::Symbol mounts;
|
Config::ConfigTable::Symbol mounts;
|
||||||
config_util.GetAll("vfs-mount", mounts);
|
config_util.GetAll("vfs-mount", mounts);
|
||||||
@ -495,10 +498,6 @@ get_global_ptr() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finally, our cwd is initially from the environment, if that
|
|
||||||
// maps into our new VFS.
|
|
||||||
_global_ptr->chdir(ExecutionEnvironment::get_cwd());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return _global_ptr;
|
return _global_ptr;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user