diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-07-22 13:11:15 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-07-22 13:11:15 -0500 |
| commit | 4775fd74b87f1ea6a91f732c0fda965df641280b (patch) | |
| tree | 5e40416fe6000de36ac51de74deca412b2c6c603 | |
| parent | 705439c78b9e33637505aaf8c3f6b433cc5854ce (diff) | |
| parent | ba33649d7ef3fa1771bb29d9704d7bef36d40542 (diff) | |
| download | monzero-gui-4775fd74b87f1ea6a91f732c0fda965df641280b.tar.gz monzero-gui-4775fd74b87f1ea6a91f732c0fda965df641280b.tar.xz monzero-gui-4775fd74b87f1ea6a91f732c0fda965df641280b.zip | |
Merge pull request #2294
ba33649 Fix segfault on Tails (tobtoht)
| -rw-r--r-- | src/qt/MoneroSettings.cpp | 3 | ||||
| -rw-r--r-- | src/qt/MoneroSettings.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/qt/MoneroSettings.cpp b/src/qt/MoneroSettings.cpp index ba3e6876..1de786a6 100644 --- 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 index 6de7f641..cda22e02 100644 --- a/src/qt/MoneroSettings.h +++ b/src/qt/MoneroSettings.h @@ -72,7 +72,7 @@ private: 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; |