wip property rework

gulrak · Sep 18, 2024 · 8d75175 · 8d75175
1 parent 1049915
commit 8d75175
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/emulation/coreregistry.cpp b/src/emulation/coreregistry.cpp
@@ -61,6 +61,10 @@ Properties CoreRegistry::IFactoryInfo::variantProperties(const std::string& vari
 CoreRegistry::CoreRegistry()
 {
     for(auto& [key, info] : factoryMap()) {
+        orderedFactories.emplace_back(key, info.get());
+    }
+    std::sort(orderedFactories.begin(), orderedFactories.end(), [](const auto& lhs, const auto& rhs) { return lhs.second->score < rhs.second->score; });
+    for(auto& [key, info] : orderedFactories) {
         if(!coresCombo.empty())
             coresCombo += ";";
         coresCombo += key;
@@ -74,9 +78,8 @@ CoreRegistry::CoreRegistry()
                 supportedExtensions.insert(defaultExtensions.begin(), defaultExtensions.end());
             }
         }
-        orderedFactories.emplace_back(key, info.get());
+
     }
-    std::sort(orderedFactories.begin(), orderedFactories.end(), [](const auto& lhs, const auto& rhs) { return lhs.second->score < rhs.second->score; });
 }
 
 CoreRegistry::FactoryMap& CoreRegistry::factoryMap()

diff --git a/src/emulation/coreregistry.hpp b/src/emulation/coreregistry.hpp
@@ -139,7 +139,7 @@ class CoreRegistry {
     {
         using iterator_category = std::forward_iterator_tag;
         using difference_type   = std::ptrdiff_t;
-        using value_type        = std::pair<std::string_view,const IFactoryInfo*>;
+        using value_type        = std::pair<std::string_view,IFactoryInfo*>;
         using pointer           = value_type*;
         using reference         = value_type&;
         explicit Iterator(std::vector<value_type>::iterator iter) : _iter(iter) {}