Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SYNERGY-835 Synergy stops working #6975

Merged
merged 8 commits into from Apr 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -7,6 +7,7 @@ Bug fixes:
- #6972 Fix SonarCloud security hotspots
- #6971 Fix vulnerabilities from SonarCloud
- #6974 Fix macOS 10.13 application filess
- #6975 Fix server stop working
- #6976 Fix windows builds

Enhancements:
Expand Down
48 changes: 33 additions & 15 deletions src/gui/src/MainWindow.cpp
Expand Up @@ -793,31 +793,45 @@ bool MainWindow::clientArgs(QStringList& args, QString& app)

QString MainWindow::configFilename()
{
QString filename;
QString configFullPath;
if (appConfig().getUseExternalConfig())
{
filename = appConfig().getConfigFile();
configFullPath = appConfig().getConfigFile();
}
else
{
// TODO: no need to use a temporary file, since we need it to
// be permenant (since it'll be used for Windows services, etc).
QTemporaryFile tempConfigFile;
tempConfigFile.setAutoRemove(false);
QStringList errors;
for (auto path : {QStandardPaths::AppDataLocation,
QStandardPaths::AppConfigLocation})
{
auto configDirPath = QStandardPaths::writableLocation(path);
if (!QDir().mkpath(configDirPath))
{
errors.push_back(tr("Failed to create config folder \"%1\"").arg(configDirPath));
continue;
}

if (!tempConfigFile.open())
{
QMessageBox::critical(this, tr("Cannot write configuration file"), tr("The temporary configuration file required to start synergy can not be written."));
return "";
}
QFile configFile(configDirPath + "/LastConfig.cfg");
if (!configFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
{
errors.push_back(tr("File:\"%1\" Error:%2").arg(configFile.fileName(), configFile.errorString()));
continue;
}

serverConfig().save(tempConfigFile);
filename = tempConfigFile.fileName();
serverConfig().save(configFile);
configFile.close();
configFullPath = configFile.fileName();

tempConfigFile.close();
break;
}

if (configFullPath.isEmpty())
{
QMessageBox::critical(this, tr("Cannot write configuration file"), errors.join('\n'));
}
}

return filename;
return configFullPath;
}

QString MainWindow::address() const
Expand Down Expand Up @@ -855,6 +869,10 @@ bool MainWindow::serverArgs(QStringList& args, QString& app)
}

QString configFilename = this->configFilename();
if (configFilename.isEmpty())
{
return false;
}
#if defined(Q_OS_WIN)
// wrap in quotes in case username contains spaces.
configFilename = QString("\"%1\"").arg(configFilename);
Expand Down