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

svn-id: r34660

2 files changed, 2 insertions, 2 deletions

diff --git a/common/archive.cpp b/common/archive.cpp
index bae316d5e5..ee27b216d1 100644
--- a/common/archive.cpp
+++ b/common/archive.cpp
@@ -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) {
diff --git a/common/str.h b/common/str.h
index 772718a087..c3e773c3e4 100644
--- a/common/str.h
+++ b/common/str.h
@@ -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();