Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-18 16:17:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(GODT-2807): fix issue where sessionID would not be removed from command-line on restart by bridge-gui.

Browse Source
This commit is contained in:
Xavier Michelon
2023-07-17 12:45:06 +02:00
parent 1ffb9089ba
commit cfca429067
5 changed files with 145 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
internal/frontend/bridge-gui/bridge-gui/AppController.cpp
View File

@ -20,6 +20,7 @@
#include "QMLBackend.h"
#include "SentryUtils.h"
#include "Settings.h"
#include <bridgepp/CLI/CLIUtils.h>
#include <bridgepp/GRPC/GRPCClient.h>
#include <bridgepp/Exception/Exception.h>
#include <bridgepp/ProcessMonitor.h>
@ -101,19 +102,23 @@ void AppController::onFatalError(Exception const &exception) {
qApp->exit(EXIT_FAILURE);
}
//****************************************************************************************************************************************************
/// \param[in] isCrashing Is the restart triggered by a crash.
//****************************************************************************************************************************************************
void AppController::restart(bool isCrashing) {
if (!launcher_.isEmpty()) {
QProcess p;
log_->info(QString("Restarting - App : %1 - Args : %2").arg(launcher_, launcherArgs_.join(" ")));
QStringList args = launcherArgs_;
if (isCrashing) {
args.append(noWindowFlag);
}
p.startDetached(launcher_, args);
p.waitForStarted();
if (launcher_.isEmpty()) {
return;
}
QProcess p;
QStringList args = stripStringParameterFromCommandLine("--session-id", launcherArgs_);
if (isCrashing) {
args.append(noWindowFlag);
}
log_->info(QString("Restarting - App : %1 - Args : %2").arg(launcher_, args.join(" ")));
p.startDetached(launcher_, args);
p.waitForStarted();
}