Merge pull request #2295

ba33649 Fix segfault on Tails (tobtoht)
monero-project · Jul 22, 2019 · ad8c3a1 · ad8c3a1
2 parents 300a5af + ba33649
commit ad8c3a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/qt/MoneroSettings.cpp b/src/qt/MoneroSettings.cpp
@@ -147,7 +147,8 @@ void MoneroSettings::reset()
 {
     if (this->m_initialized && this->m_settings && !this->m_changedProperties.isEmpty())
         this->store();
-    delete this->m_settings;
+    if (this->m_settings)
+        delete this->m_settings;
 }
 
 void MoneroSettings::store()

diff --git a/src/qt/MoneroSettings.h b/src/qt/MoneroSettings.h
@@ -72,7 +72,7 @@ public slots:
     void store();
 
     QHash<const char *, QVariant> m_changedProperties;
-    QSettings *m_settings;
+    QSettings *m_settings = NULL;
     QString m_fileName = QString("");
     bool m_initialized = false;
     int m_timerId = 0;