Fix partial virtual overrides in mythgame settings ui usage.

MythTV · Sep 11, 2012 · 6c43f0c · 6c43f0c
1 parent a825dee
commit 6c43f0c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/mythplugins/mythgame/mythgame/gamesettings.cpp b/mythplugins/mythgame/mythgame/gamesettings.cpp
@@ -333,9 +333,9 @@ MythGamePlayerEditor::MythGamePlayerEditor() : listbox(new ListBoxSetting(this))
     addChild(listbox);
 }
 
-DialogCode MythGamePlayerEditor::exec(void)
+DialogCode MythGamePlayerEditor::exec(bool saveOnExec, bool doLoad)
 {
-    while (ConfigurationDialog::exec() == kDialogCodeAccepted)
+    while (ConfigurationDialog::exec(saveOnExec, doLoad) == kDialogCodeAccepted)
         edit();
 
     return kDialogCodeRejected;

diff --git a/mythplugins/mythgame/mythgame/gamesettings.h b/mythplugins/mythgame/mythgame/gamesettings.h
@@ -86,7 +86,9 @@ class MythGamePlayerSettings : public QObject, public ConfigurationWizard
     {
         if (name)
             ConfigurationWizard::Save();
-    };
+    }
+
+    virtual void Save(QString /*destination*/) { }
 
   private:
     class ID : public AutoIncrementDBSetting
@@ -128,10 +130,11 @@ class MPUBLIC MythGamePlayerEditor : public QObject, public ConfigurationDialog
     virtual MythDialog *dialogWidget(MythMainWindow *parent,
                                      const char     *widgetName=0);
 
-    virtual DialogCode exec(void);
+    virtual DialogCode exec(bool saveOnExec = true, bool doLoad = true);
 
     virtual void Load(void);
     virtual void Save(void) { }
+    virtual void Save(QString /*destination*/) { }
 
 public slots:
     void menu();