From 9fe6d7417f5346b4e586ef556335db697e953d96 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 24 Jul 2016 01:37:03 +0200 Subject: [PATCH] refs #712, display error when network interface is not available --- src/swiftguistandard/main.cpp | 6 +++++- src/swiftguistandard/swiftguistdinit.cpp | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/swiftguistandard/main.cpp b/src/swiftguistandard/main.cpp index 876519270..a294aaf86 100644 --- a/src/swiftguistandard/main.cpp +++ b/src/swiftguistandard/main.cpp @@ -27,7 +27,11 @@ int main(int argc, char *argv[]) CSwiftGuiStdApplication a; a.signalStartupAutomatically(); // application will signal startup on its own a.splashScreen(":/own/icons/own/swift/swiftCirclePilotClient1024.png"); - if (!a.start()) { return EXIT_FAILURE; } + if (!a.start()) + { + a.gracefulShutdown(); + return EXIT_FAILURE; + } //! [SwiftApplicationDemo] // show window diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp index cdf9d2be1..e3f2ca85e 100644 --- a/src/swiftguistandard/swiftguistdinit.cpp +++ b/src/swiftguistandard/swiftguistdinit.cpp @@ -27,6 +27,7 @@ #include "blackgui/managedstatusbar.h" #include "blackgui/overlaymessagesframe.h" #include "blackgui/stylesheetutility.h" +#include "blackmisc/network/networkutils.h" #include "blackmisc/loghandler.h" #include "blackmisc/logmessage.h" #include "blackmisc/logpattern.h" @@ -49,6 +50,7 @@ using namespace BlackConfig; using namespace BlackCore; using namespace BlackCore::Context; using namespace BlackMisc; +using namespace BlackMisc::Network; using namespace BlackMisc::Input; using namespace BlackGui; using namespace BlackGui::Components; @@ -148,6 +150,11 @@ void SwiftGuiStd::init() sGui->startUpCompleted(true); this->m_init = true; + + if (!CNetworkUtils::hasConnectedInterface()) + { + CLogMessage(this).error("No network interface, software will not work properly"); + } } void SwiftGuiStd::initStyleSheet()