From f2efa2981b1637726a52129d756de1ff3ae107ae Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 22 Feb 2018 01:08:44 +0100 Subject: [PATCH] Ref T258, use external 7zip to unzip xswiftbus --- .../components/installxswiftbuscomponent.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/blackgui/components/installxswiftbuscomponent.cpp b/src/blackgui/components/installxswiftbuscomponent.cpp index defcca979..52208e648 100644 --- a/src/blackgui/components/installxswiftbuscomponent.cpp +++ b/src/blackgui/components/installxswiftbuscomponent.cpp @@ -12,6 +12,7 @@ #include "blackgui/guiapplication.h" #include "blackgui/overlaymessagesframe.h" #include "blackmisc/simulation/xplane/xplaneutil.h" +#include "blackmisc/compressutils.h" #include "blackmisc/logmessage.h" #include "blackmisc/directoryutils.h" #include "blackmisc/fileutils.h" @@ -157,13 +158,23 @@ namespace BlackGui { this->hideLoading(); if (sGui && sGui->isShuttingDown()) { return; } - if (status.isWarningOrAbove() || !this->existsXSwiftBusPluginDir()) + if (status.isWarningOrAbove()) { - this->showOverlayMessage(status, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); + this->showOverlayMessage(status); return; } + if (!this->existsXSwiftBusPluginDir()) + { + const CStatusMessage msg = CStatusMessage(this).warning("No valid install directory, cannot continue."); + this->showOverlayMessage(msg); + return; + } + static const QString confirm("Install in '%1'?"); - this->showOverlayMessagesWithConfirmation(status, false, confirm.arg(ui->le_XSwiftBusPluginDir->text()), [ = ] { this->installXSwiftBus(); }); + this->showOverlayMessagesWithConfirmation(status, false, confirm.arg(ui->le_XSwiftBusPluginDir->text()), [ = ] + { + QTimer::singleShot(0, this, &CInstallXSwiftBusComponent::installXSwiftBus); + }); } CRemoteFile CInstallXSwiftBusComponent::getRemoteFileSelected() const