From ad607bb79eac69a35e59ad726237c4f142dc050e Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov Date: Mon, 19 Apr 2021 14:59:18 +0300 Subject: [PATCH] SYNERGY-918 Manual config error in client mode --- src/gui/src/MainWindow.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 6bd477633b..682869ac08 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -661,6 +661,12 @@ void MainWindow::startSynergy() } #endif + // put a space between last log output and new instance. + if (!m_pLogOutput->toPlainText().isEmpty()) + appendLogRaw(""); + + appendLogInfo("starting " + QString(synergyType() == synergyServer ? "server" : "client")); + if ((synergyType() == synergyClient && !clientArgs(args, app)) || (synergyType() == synergyServer && !serverArgs(args, app))) { @@ -675,12 +681,6 @@ void MainWindow::startSynergy() connect(synergyProcess(), SIGNAL(readyReadStandardError()), this, SLOT(logError())); } - // put a space between last log output and new instance. - if (!m_pLogOutput->toPlainText().isEmpty()) - appendLogRaw(""); - - appendLogInfo("starting " + QString(synergyType() == synergyServer ? "server" : "client")); - qDebug() << args; // show command if debug log level... @@ -688,7 +688,6 @@ void MainWindow::startSynergy() appendLogInfo(QString("command: %1 %2").arg(app, args.join(" "))); } - appendLogInfo("config file: " + configFilename()); appendLogInfo("log level: " + appConfig().logLevelText()); if (appConfig().logToFile()) @@ -876,6 +875,7 @@ bool MainWindow::serverArgs(QStringList& args, QString& app) configFilename = QString("\"%1\"").arg(configFilename); #endif args << "-c" << configFilename << "--address" << address(); + appendLogInfo("config file: " + configFilename); #ifndef SYNERGY_ENTERPRISE if (!appConfig().serialKey().isEmpty()) {