Compare commits

...

4 Commits

Author SHA1 Message Date
luigi1111
6ec45a819b Merge pull request #2296
22b22c2 build: set submodule to v0.14.1.2 (selsta)
2019-07-22 13:15:15 -05:00
luigi1111
ad8c3a153f Merge pull request #2295
ba33649 Fix segfault on Tails (tobtoht)
2019-07-22 13:12:49 -05:00
selsta
22b22c22ea build: set submodule to v0.14.1.2 2019-07-18 15:41:45 +02:00
thotbot
ba33649d7e Fix segfault on Tails 2019-07-18 13:22:38 +00:00
3 changed files with 4 additions and 3 deletions

View File

@@ -17,7 +17,7 @@ if [ ! -d $MONERO_DIR/src ]; then
fi fi
git submodule update --remote git submodule update --remote
git -C $MONERO_DIR fetch git -C $MONERO_DIR fetch
git -C $MONERO_DIR checkout v0.14.1.1 git -C $MONERO_DIR checkout v0.14.1.2
# get monero core tag # get monero core tag
pushd $MONERO_DIR pushd $MONERO_DIR

View File

@@ -147,7 +147,8 @@ void MoneroSettings::reset()
{ {
if (this->m_initialized && this->m_settings && !this->m_changedProperties.isEmpty()) if (this->m_initialized && this->m_settings && !this->m_changedProperties.isEmpty())
this->store(); this->store();
delete this->m_settings; if (this->m_settings)
delete this->m_settings;
} }
void MoneroSettings::store() void MoneroSettings::store()

View File

@@ -72,7 +72,7 @@ private:
void store(); void store();
QHash<const char *, QVariant> m_changedProperties; QHash<const char *, QVariant> m_changedProperties;
QSettings *m_settings; QSettings *m_settings = NULL;
QString m_fileName = QString(""); QString m_fileName = QString("");
bool m_initialized = false; bool m_initialized = false;
int m_timerId = 0; int m_timerId = 0;