From 08c952e53a4efcd5b50c0ec947bf216101c027ef Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 7 Nov 2020 19:05:15 -0500
Subject: stopped using core dump stuff from usvfs, mo has its own set
 exception handler at the start, it can handle not having qt or data paths
 hopefully fixed infinite crash dumps

---
 src/settings.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/settings.cpp')

diff --git a/src/settings.cpp b/src/settings.cpp
index 99b41e1f..a8ada6ba 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -2110,23 +2110,23 @@ void DiagnosticsSettings::setLootLogLevel(lootcli::LogLevels level)
   set(m_Settings, "Settings", "loot_log_level", level);
 }
 
-CrashDumpsType DiagnosticsSettings::crashDumpsType() const
+env::CoreDumpTypes DiagnosticsSettings::coreDumpType() const
 {
-  return get<CrashDumpsType>(m_Settings,
-    "Settings", "crash_dumps_type", CrashDumpsType::Mini);
+  return get<env::CoreDumpTypes>(m_Settings,
+    "Settings", "crash_dumps_type", env::CoreDumpTypes::Mini);
 }
 
-void DiagnosticsSettings::setCrashDumpsType(CrashDumpsType type)
+void DiagnosticsSettings::setCoreDumpType(env::CoreDumpTypes type)
 {
   set(m_Settings, "Settings", "crash_dumps_type", type);
 }
 
-int DiagnosticsSettings::crashDumpsMax() const
+int DiagnosticsSettings::maxCoreDumps() const
 {
   return get<int>(m_Settings, "Settings", "crash_dumps_max", 5);
 }
 
-void DiagnosticsSettings::setCrashDumpsMax(int n)
+void DiagnosticsSettings::setMaxCoreDumps(int n)
 {
   set(m_Settings, "Settings", "crash_dumps_max", n);
 }
-- 
cgit v1.3.1


From 0b8fbfdc57ad22c996fa88f6d974269afec004fd Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 7 Nov 2020 19:43:11 -0500
Subject: larger initial size for the instance dialog save geometry if settings
 are available

---
 src/instancemanagerdialog.cpp | 28 +++++++++++++++++++++++++++-
 src/instancemanagerdialog.h   | 10 ++++++++++
 src/instancemanagerdialog.ui  |  4 ++--
 src/settings.cpp              |  8 +++++++-
 src/settings.h                | 10 +++++++++-
 5 files changed, 55 insertions(+), 5 deletions(-)

(limited to 'src/settings.cpp')

diff --git a/src/instancemanagerdialog.cpp b/src/instancemanagerdialog.cpp
index 71fed78d..d579ea9c 100644
--- a/src/instancemanagerdialog.cpp
+++ b/src/instancemanagerdialog.cpp
@@ -111,7 +111,7 @@ InstanceManagerDialog::InstanceManagerDialog(
 {
   ui->setupUi(this);
 
-  ui->splitter->setSizes({200, 1});
+  ui->splitter->setSizes({250, 1});
   ui->splitter->setStretchFactor(0, 0);
   ui->splitter->setStretchFactor(1, 1);
 
@@ -146,6 +146,32 @@ InstanceManagerDialog::InstanceManagerDialog(
   connect(ui->close, &QPushButton::clicked, [&]{ close(); });
 }
 
+void InstanceManagerDialog::showEvent(QShowEvent* e)
+{
+  // there might not be a global Settings object if this is called on startup
+  // when there's no current instance
+  const auto* s = Settings::maybeInstance();
+
+  if (s) {
+    s->geometry().restoreGeometry(this);
+  }
+
+  QDialog::showEvent(e);
+}
+
+void InstanceManagerDialog::done(int r)
+{
+  // there might not be a global Settings object if this is called on startup
+  // when there's no current instance
+  auto* s = Settings::maybeInstance();
+
+  if (s) {
+    s->geometry().saveGeometry(this);
+  }
+
+  QDialog::done(r);
+}
+
 void InstanceManagerDialog::updateInstances()
 {
   auto& m = InstanceManager::singleton();
diff --git a/src/instancemanagerdialog.h b/src/instancemanagerdialog.h
index 94f379ca..2641f716 100644
--- a/src/instancemanagerdialog.h
+++ b/src/instancemanagerdialog.h
@@ -78,6 +78,16 @@ public:
   //
   void setRestartOnSelect(bool b);
 
+
+  // saves geometry
+  //
+  void done(int r) override;
+
+protected:
+  // restores geometry
+  //
+  void showEvent(QShowEvent* e) override;
+
 private:
   static const std::size_t NoSelection = -1;
 
diff --git a/src/instancemanagerdialog.ui b/src/instancemanagerdialog.ui
index 45b99e21..4137d1b6 100644
--- a/src/instancemanagerdialog.ui
+++ b/src/instancemanagerdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>689</width>
-    <height>413</height>
+    <width>884</width>
+    <height>539</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/settings.cpp b/src/settings.cpp
index a8ada6ba..54d32786 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -86,14 +86,20 @@ Settings::~Settings()
   }
 }
 
-Settings &Settings::instance()
+Settings& Settings::instance()
 {
   if (s_Instance == nullptr) {
     throw std::runtime_error("no instance of \"Settings\"");
   }
+
   return *s_Instance;
 }
 
+Settings* Settings::maybeInstance()
+{
+  return s_Instance;
+}
+
 void Settings::processUpdates(
   const QVersionNumber& currentVersion, const QVersionNumber& lastVersion)
 {
diff --git a/src/settings.h b/src/settings.h
index df081c5c..689067d7 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -693,7 +693,15 @@ public:
   Settings(const QString& path, bool globalInstance=false);
   ~Settings();
 
-  static Settings &instance();
+
+  // throws if there is no global Settings instance
+  //
+  static Settings& instance();
+
+  // returns null if there is no global Settings instance
+  //
+  static Settings* maybeInstance();
+
 
   // name of the ini file
   //
-- 
cgit v1.3.1