From 948f122738e327634ff7461152ae316ff79a8d0c Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Fri, 11 Sep 2020 15:19:19 -0400
Subject: [PATCH] connectivitymonitor: re-add connectivity monitor
Change-Id: I8779770475b7c58dce693dafcf2e74839635a2a0
---
src/mainapplication.cpp | 12 ++++++++++++
src/mainapplication.h | 6 ++++++
2 files changed, 18 insertions(+)
diff --git a/src/mainapplication.cpp b/src/mainapplication.cpp
index cf7f7cbb2..dc93b6b01 100644
--- a/src/mainapplication.cpp
+++ b/src/mainapplication.cpp
@@ -133,6 +133,7 @@ MainApplication::init()
GlobalInstances::setPixmapManipulator(std::make_unique<PixbufManipulator>());
initLrc();
+ initConnectivityMonitor();
bool startMinimized {false};
parseArguments(startMinimized);
@@ -208,6 +209,17 @@ MainApplication::initLrc()
LRCInstance::getAPI().holdConferences = false;
}
+void
+MainApplication::initConnectivityMonitor()
+{
+#ifdef Q_OS_WIN
+ connectivityMonitor_.reset(new ConnectivityMonitor(this));
+ connect(connectivityMonitor_.get(), &ConnectivityMonitor::connectivityChanged, [this] {
+ LRCInstance::connectivityChanged();
+ });
+#endif // Q_OS_WIN
+}
+
void
MainApplication::parseArguments(bool& startMinimized)
{
diff --git a/src/mainapplication.h b/src/mainapplication.h
index 95e656b18..fd72c947b 100644
--- a/src/mainapplication.h
+++ b/src/mainapplication.h
@@ -20,6 +20,8 @@
#pragma once
+#include "connectivitymonitor.h"
+
#include <QFile>
#include <QApplication>
#include <QQmlApplicationEngine>
@@ -40,6 +42,7 @@ public:
private:
void loadTranslations();
void initLrc();
+ void initConnectivityMonitor();
void parseArguments(bool& startMinimized);
void setApplicationFont();
void initQmlEngine();
@@ -48,6 +51,9 @@ private:
void cleanup();
private:
+#ifdef Q_OS_WIN
+ QScopedPointer<ConnectivityMonitor> connectivityMonitor_;
+#endif // Q_OS_WIN
QScopedPointer<QFile> debugFile_;
QQmlApplicationEngine* engine_;
};
--
GitLab