Fixed resetConfig() bug

Author: dirkwhoffmann

Core/Infrastructure/Configurable.cpp

@@ -52,7 +52,7 @@ Configurable::setOption(const string &opt, const string &value)
 }
 
 void
-Configurable::resetConfig(const Defaults &defaults, isize objid)
+Configurable::resetConfigItems(const Defaults &defaults, isize objid)
 {
     for (auto &option : getOptions()) {
 

Core/Infrastructure/Configurable.h

@@ -45,7 +45,7 @@ class Configurable
     void setOption(const string &opt, const string &value);
 
     // Resets all config options
-    void resetConfig(const class Defaults &defaults, isize objid = 0);
+    virtual void resetConfigItems(const class Defaults &defaults, isize objid = 0);
 
     // Dumps the current configuration
     void dumpConfig(std::ostream &os) const;

Core/Infrastructure/CoreComponent.cpp

@@ -117,7 +117,7 @@ void
 CoreComponent::resetConfig()
 {
     postorderWalk([this](CoreComponent *c) {
-        c->Configurable::resetConfig(emulator.defaults, c->objid);
+        c->resetConfigItems(emulator.defaults, c->objid);
     });
 }
 

Core/Infrastructure/Host.cpp

@@ -78,6 +78,12 @@ Host::setOption(Opt opt, i64 value)
     }
 }
 
+void
+Host::resetConfigItems(const class Defaults &defaults, isize objid)
+{
+    // Don't reset any host properties
+}
+
 void
 Host::_dump(Category category, std::ostream &os) const
 {

Core/Infrastructure/Host.h

@@ -91,6 +91,7 @@ class Host final : public SubComponent {
     i64 getOption(Opt opt) const override;
     void checkOption(Opt opt, i64 value) override;
     void setOption(Opt opt, i64 value) override;
+    void resetConfigItems(const class Defaults &defaults, isize objid = 0) override;
 
 
     //