From 4559a26e316931695f892b205257979f0ea13afa Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 28 Dec 2014 20:44:31 -0800 Subject: Fix ConfigureDiveComputer class This caused a crash when trying to call the firmware upgrade from the downloader - no idea how this worked for the other caller (from the main menu). Anyway, with this the "offer to upgrade the OSTC after a download from an OSTC that doesn't have the latest version" is indeed functional. Signed-off-by: Dirk Hohndel --- configuredivecomputer.cpp | 3 +-- configuredivecomputer.h | 2 +- qt-ui/configuredivecomputerdialog.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configuredivecomputer.cpp b/configuredivecomputer.cpp index 769189b26..3364d92be 100644 --- a/configuredivecomputer.cpp +++ b/configuredivecomputer.cpp @@ -9,8 +9,7 @@ #include #include -ConfigureDiveComputer::ConfigureDiveComputer(QObject *parent) : - QObject(parent), +ConfigureDiveComputer::ConfigureDiveComputer() : readThread(0), writeThread(0), resetThread(0), diff --git a/configuredivecomputer.h b/configuredivecomputer.h index 59340335d..66a9bf5f5 100644 --- a/configuredivecomputer.h +++ b/configuredivecomputer.h @@ -14,7 +14,7 @@ class ConfigureDiveComputer : public QObject { Q_OBJECT public: - explicit ConfigureDiveComputer(QObject *parent = 0); + explicit ConfigureDiveComputer(); void readSettings(device_data_t *data); enum states { diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp index 48c96e594..22a0d39c8 100644 --- a/qt-ui/configuredivecomputerdialog.cpp +++ b/qt-ui/configuredivecomputerdialog.cpp @@ -117,7 +117,7 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) : ui.setupUi(this); deviceDetails = new DeviceDetails(this); - config = new ConfigureDiveComputer(this); + config = new ConfigureDiveComputer(); connect(config, SIGNAL(error(QString)), this, SLOT(configError(QString))); connect(config, SIGNAL(message(QString)), this, SLOT(configMessage(QString))); connect(config, SIGNAL(deviceDetailsChanged(DeviceDetails*)), @@ -275,7 +275,7 @@ void OstcFirmwareCheck::saveOstcFirmware(QNetworkReply *reply) file.open(QIODevice::WriteOnly); file.write(firmwareData); file.close(); - ConfigureDiveComputer *config = new ConfigureDiveComputer(MainWindow::instance()); + ConfigureDiveComputer *config = new ConfigureDiveComputer(); config->startFirmwareUpdate(storeFirmware, &devData); } -- cgit v1.2.3-70-g09d2