From f92e2c376d36132a9676b30f0b08543f27a13064 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Thu, 19 Sep 2019 16:27:41 -0400
Subject: TaskDialog for restarting as admin for steam added a parent widget
 parameter to a bunch of places fixed paths still getting changed even if
 folders can't be created made private the member variables that were
 temporarily public during rework

---
 src/settingsdialog.cpp | 44 +++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

(limited to 'src/settingsdialog.cpp')

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 1d3d4a39..8fb25b1c 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -33,8 +33,8 @@ SettingsDialog::SettingsDialog(PluginContainer *pluginContainer, Settings& setti
   : TutorableDialog("SettingsDialog", parent)
   , ui(new Ui::SettingsDialog)
   , m_settings(settings)
-  , m_PluginContainer(pluginContainer)
-  , m_keyChanged(false)
+  , m_pluginContainer(pluginContainer)
+  , m_restartNeeded(false)
 {
   ui->setupUi(this);
 
@@ -47,6 +47,25 @@ SettingsDialog::SettingsDialog(PluginContainer *pluginContainer, Settings& setti
   m_tabs.push_back(std::unique_ptr<SettingsTab>(new WorkaroundsSettingsTab(settings, *this)));
 }
 
+PluginContainer* SettingsDialog::pluginContainer()
+{
+  return m_pluginContainer;
+}
+
+QWidget* SettingsDialog::parentWidgetForDialogs()
+{
+  if (isVisible()) {
+    return this;
+  } else {
+    return parentWidget();
+  }
+}
+
+void SettingsDialog::setRestartNeeded()
+{
+  m_restartNeeded = true;
+}
+
 int SettingsDialog::exec()
 {
   GeometrySaver gs(m_settings, this);
@@ -68,13 +87,8 @@ int SettingsDialog::exec()
     }
   }
 
-  bool restartNeeded = false;
-  if (getApiKeyChanged()) {
-    restartNeeded = true;
-  }
-
-  if (restartNeeded) {
-    if (QMessageBox::question(nullptr,
+  if (m_restartNeeded) {
+    if (QMessageBox::question(parentWidgetForDialogs(),
       tr("Restart Mod Organizer?"),
       tr("In order to finish configuration changes, MO must be restarted.\n"
         "Restart it now?"),
@@ -111,7 +125,7 @@ void SettingsDialog::accept()
        QDir::fromNativeSeparators(
            Settings::instance().paths().mods(true))) &&
       (QMessageBox::question(
-           nullptr, tr("Confirm"),
+        parentWidgetForDialogs(), tr("Confirm"),
            tr("Changing the mod directory affects all your profiles! "
               "Mods not present (or named differently) in the new location "
               "will be disabled in all profiles. "
@@ -124,11 +138,6 @@ void SettingsDialog::accept()
   TutorableDialog::accept();
 }
 
-bool SettingsDialog::getApiKeyChanged()
-{
-  return m_keyChanged;
-}
-
 
 SettingsTab::SettingsTab(Settings& s, SettingsDialog& d)
   : ui(d.ui), m_settings(s), m_dialog(d)
@@ -146,3 +155,8 @@ SettingsDialog& SettingsTab::dialog()
 {
   return m_dialog;
 }
+
+QWidget* SettingsTab::parentWidget()
+{
+  return m_dialog.parentWidgetForDialogs();
+}
-- 
cgit v1.3.1