mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: do not crash on selecting dive computers

Browse source 
For reasons unknown to me, the DCDeviceData instance was freed way too early,
and used afterwards, obviously resulting in a SIGSEGV. This commit creates
the DCDeviceData as a direct child of the QMLManager instance, ensuring
it does not get freed prematurely.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Jan Mulder 2017-06-08 13:38:52 +02:00 • committed by Dirk Hohndel
parent 22e40063f1
commit a7288cc912
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/downloadfromdcthread.cpp
View file

@ -16,11 +16,11 @@ static QString str_error(const char *fmt, ...)
return str; return str;
} }
DownloadThread::DownloadThread() : m_data(new DCDeviceData()) DownloadThread::DownloadThread()
{ {
m_data = DCDeviceData::instance();
} }
void DownloadThread::run() void DownloadThread::run()
{ {
auto internalData = m_data->internalData(); auto internalData = m_data->internalData();

3
mobile-widgets/qmlmanager.cpp
View file

@ -91,7 +91,8 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
m_updateSelectedDive(-1), m_updateSelectedDive(-1),
m_selectedDiveTimestamp(0), m_selectedDiveTimestamp(0),
m_credentialStatus(UNKNOWN), m_credentialStatus(UNKNOWN),
alreadySaving(false) alreadySaving(false),
m_device_data(new DCDeviceData(this))
{ {
#if defined(BT_SUPPORT) #if defined(BT_SUPPORT)
// ensure that we start the BTDiscovery - this should be triggered by the export of the class // ensure that we start the BTDiscovery - this should be triggered by the export of the class

2
mobile-widgets/qmlmanager.h
View file

@ -18,6 +18,7 @@
#include "core/btdiscovery.h" #include "core/btdiscovery.h"
#include "core/gpslocation.h" #include "core/gpslocation.h"
#include "core/downloadfromdcthread.h"
#include "qt-models/divelistmodel.h" #include "qt-models/divelistmodel.h"
class QMLManager : public QObject { class QMLManager : public QObject {
@ -204,6 +205,7 @@ private:
bool checkDepth(DiveObjectHelper *myDive, struct dive *d, QString depth); bool checkDepth(DiveObjectHelper *myDive, struct dive *d, QString depth);
bool currentGitLocalOnly; bool currentGitLocalOnly;
bool m_showPin; bool m_showPin;
DCDeviceData *m_device_data;
signals: signals:
void cloudUserNameChanged(); void cloudUserNameChanged();