Avoid duplicate names if an item is available from multiple sources

diff --git a/source/collection.cpp b/source/collection.cpp
index aa607bdedcde65ecfd298b21af06fc9dc42aeac2..165b77007fce815eac0b4498d58950895ca1706d 100644 (file)
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -1,3 +1,4 @@
+#include <set>
 #include "collection.h"
 
 using namespace std;
@@ -102,13 +103,15 @@ IO::Seekable *Collection::open_from_sources(const string &name)
 
 void Collection::gather_names_from_sources(list<string> &names, const CollectionItemTypeBase &type) const
 {
+       set<string> new_names;
        for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
        {
                std::list<std::string> available_names = (*i)->get_names(type);
                for(std::list<std::string>::iterator j=available_names.begin(); j!=available_names.end(); ++j)
                        if(!items.count(*j))
-                               names.push_back(*j);
+                               new_names.insert(*j);
        }
+       names.insert(names.end(), new_names.begin(), new_names.end());
 }
 
 void Collection::load_items_from_sources(const CollectionItemTypeBase &type)