thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a nasty bug in SearchManager::addDirectory; made the 'char' constructor of Common::String explicit, to avoid such bugs in the future

Browse source 
svn-id: r34660
This commit is contained in:
Max Horn 2008-09-27 18:34:24 +00:00
parent 479e67f2f2
commit 0d34b772a4
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/archive.cpp
View file

@ -338,7 +338,7 @@ void SearchManager::addArchive(const String &name, ArchivePtr archive) {
}
void SearchManager::addDirectory(const String &name, const String &directory) {
addDirectoryRecursive(name, 1);
addDirectoryRecursive(name, directory, 1);
}
void SearchManager::addDirectoryRecursive(const String &name, const String &directory, int depth) {

2
common/str.h
View file

@ -112,7 +112,7 @@ public:
String(const String &str);
/** Construct a string consisting of the given character. */
String(char c);
explicit String(char c);
~String();

2
engines/parallaction/balloons.cpp
View file

@ -79,7 +79,7 @@ public:
token = tokenizer.nextToken();
token = expand(token);
if (token == '/') {
if (token == "/") {
tokenWidth = 0;
action();
textNewLine();