Merge 'checkupdate-destructor'

src/ckb/kbfirmware.cpp

@@ -14,21 +14,18 @@ KbFirmware::FW::FW() : fwVersion(0.f), ckbVersion(0.f) {}
 KbFirmware::KbFirmware() :
     lastCheck(0), lastFinished(0), networkManager(0), tableDownload(0), hasGPG(UNKNOWN)
 {
+    // Disable bearer polling. This corrects an issue with latency spikes when
+    // using WiFi. The problem and workaround are described here:
+    // https://lostdomain.org/2017/06/17/qt-qnetworkaccessmanager-causing-latency-spikes-on-wifi/
+    qputenv("QT_BEARER_POLL_TIMEOUT", QByteArray::number(-1));
+    networkManager = new QNetworkAccessManager();
 }
 
 KbFirmware::~KbFirmware(){
-    //delete networkManager;
-    // ^ This can cause a crash (QT bug?)
-}
-
-void KbFirmware::initManager(){
-    if(networkManager)
-        return;
-    networkManager = new QNetworkAccessManager();
+    delete networkManager;
 }
 
 bool KbFirmware::_checkUpdates(){
-    initManager();
     quint64 now = QDateTime::currentMSecsSinceEpoch();
     if(now < lastCheck + AUTO_CHECK_TIME)
         return false;

src/ckb/kbfirmware.h

@@ -24,6 +24,9 @@ class KbFirmware : public QObject
     // Downloads and extracts the latest firmware for a keyboard. Returns an empty array on failure.
     static inline QByteArray    dataForBoard(const QString& features)                                   { return instance._fileForBoard(features); }
 
+    // Network manager object to use with QtNetwork
+    QNetworkAccessManager* 	networkManager;
+
 private:
     KbFirmware();
     ~KbFirmware();
@@ -42,10 +45,6 @@ class KbFirmware : public QObject
     // SHA256 of last downloaded table (redundancy check)
     QByteArray          fwTableHash;
 
-    // Network manager for downloading updates
-    // It can't be declared as part of the object or it will misbehave. Has to be initialized on use.
-    QNetworkAccessManager* networkManager;
-    void initManager();
     // Current FW table download (null if nothing downloading)
     QNetworkReply* tableDownload;