smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SYNERGY-918 Manual config error in client mode

Browse source
This commit is contained in:
Serhii Hadzhilov 2021-04-19 14:59:18 +03:00
parent f767aa3a53
commit ad607bb79e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gui/src/MainWindow.cpp
View file

@ -661,6 +661,12 @@ void MainWindow::startSynergy()
} }
#endif #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)) if ((synergyType() == synergyClient && !clientArgs(args, app))
|| (synergyType() == synergyServer && !serverArgs(args, app))) || (synergyType() == synergyServer && !serverArgs(args, app)))
{ {
@ -675,12 +681,6 @@ void MainWindow::startSynergy()
connect(synergyProcess(), SIGNAL(readyReadStandardError()), this, SLOT(logError())); 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; qDebug() << args;
// show command if debug log level... // show command if debug log level...
@ -688,7 +688,6 @@ void MainWindow::startSynergy()
appendLogInfo(QString("command: %1 %2").arg(app, args.join(" "))); appendLogInfo(QString("command: %1 %2").arg(app, args.join(" ")));
} }
appendLogInfo("config file: " + configFilename());
appendLogInfo("log level: " + appConfig().logLevelText()); appendLogInfo("log level: " + appConfig().logLevelText());
if (appConfig().logToFile()) if (appConfig().logToFile())
@ -876,6 +875,7 @@ bool MainWindow::serverArgs(QStringList& args, QString& app)
configFilename = QString("\"%1\"").arg(configFilename); configFilename = QString("\"%1\"").arg(configFilename);
#endif #endif
args << "-c" << configFilename << "--address" << address(); args << "-c" << configFilename << "--address" << address();
appendLogInfo("config file: " + configFilename);
#ifndef SYNERGY_ENTERPRISE #ifndef SYNERGY_ENTERPRISE
if (!appConfig().serialKey().isEmpty()) { if (!appConfig().serialKey().isEmpty()) {