X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdirectorysource.cpp;h=207f30d0e31716c310f0927b82f5ba14fe456b6a;hb=4edbe0eb078c4e480682862ccb68ebc8cb284045;hp=4bf9f5cd3d12b0808f288b9e3cd647a5ee0db682;hpb=9b1656018f783eb4aad2fbdc1de1404691e89bb1;p=libs%2Fdatafile.git

diff --git a/source/directorysource.cpp b/source/directorysource.cpp
index 4bf9f5c..207f30d 100644
--- a/source/directorysource.cpp
+++ b/source/directorysource.cpp
@@ -8,11 +8,14 @@ using namespace std;
 namespace Msp {
 namespace DataFile {
 
-void DirectorySource::add_directory(const FS::Path &d)
+void DirectorySource::add_directory(const FS::Path &d, bool replace)
 {
 	list<string> files = FS::list_files(d);
 	for(list<string>::const_iterator i=files.begin(); i!=files.end(); ++i)
-		objects[*i] = d / *i;
+	{
+		if(!objects.count(*i) || replace)
+			objects[*i] = d / *i;
+	}
 }
 
 bool DirectorySource::is_loadable(const CollectionItemTypeBase &, const string &name) const