TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

prevent spurious warning

Browse Source
This commit is contained in:
David Rose 2004-06-05 01:04:20 +00:00
parent 0a48a2fc44
commit 05833c75dd
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dtool/src/dconfig/configTable.cxx
View File

@ -191,18 +191,20 @@ void ConfigTable::ReadConfigFile() {
<< (configname + configsuffix) << endl;
for (int di = 0; di < config_search.get_num_directories(); di++) {
const Filename &directory = config_search.get_directory(di);
vector_string files;
directory.scan_directory(files);
// Scan the files in reverse order to match Configrc overwrite
// rules, so that the alphabetically earliest file has
// precedence.
for (vector_string::reverse_iterator fi = files.rbegin();
fi != files.rend();
++fi) {
if ((*fi).substr(0, configname.length()) == configname &&
(*fi).substr((*fi).length() - 1) != string("~")) {
Filename file(directory, (*fi));
config_files.add_file(file);
if (directory.is_directory()) {
vector_string files;
directory.scan_directory(files);
// Scan the files in reverse order to match Configrc overwrite
// rules, so that the alphabetically earliest file has
// precedence.
for (vector_string::reverse_iterator fi = files.rbegin();
fi != files.rend();
++fi) {
if ((*fi).substr(0, configname.length()) == configname &&
(*fi).substr((*fi).length() - 1) != string("~")) {
Filename file(directory, (*fi));
config_files.add_file(file);
}
}
}
}