fix: Store server config window state in memory instead of on disk
This commit is contained in:
committed by
Chris Rizzitello
parent
2b203c8cdd
commit
0f335d46bb
@ -87,7 +87,6 @@ public:
|
||||
};
|
||||
struct Server
|
||||
{
|
||||
inline static const auto ConfigVisible = QStringLiteral("server/configVisible");
|
||||
inline static const auto ExternalConfig = QStringLiteral("server/externalConfig");
|
||||
inline static const auto ExternalConfigFile = QStringLiteral("server/externalConfigFile");
|
||||
};
|
||||
@ -197,7 +196,6 @@ private:
|
||||
, Settings::Security::CheckPeers
|
||||
, Settings::Security::KeySize
|
||||
, Settings::Security::TlsEnabled
|
||||
, Settings::Server::ConfigVisible
|
||||
, Settings::Server::ExternalConfig
|
||||
, Settings::Server::ExternalConfigFile
|
||||
};
|
||||
|
||||
@ -645,12 +645,12 @@ void MainWindow::updateNetworkInfo()
|
||||
|
||||
void MainWindow::serverConnectionConfigureClient(const QString &clientName)
|
||||
{
|
||||
Settings::setValue(Settings::Server::ConfigVisible, true);
|
||||
m_serverConnection.serverConfigDialogVisible(true);
|
||||
ServerConfigDialog dialog(this, m_serverConfig);
|
||||
if (dialog.addClient(clientName) && dialog.exec() == QDialog::Accepted) {
|
||||
m_coreProcess.restart();
|
||||
}
|
||||
Settings::setValue(Settings::Server::ConfigVisible, false);
|
||||
m_serverConnection.serverConfigDialogVisible(false);
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -6,11 +6,9 @@
|
||||
|
||||
#include "ServerConnection.h"
|
||||
|
||||
#include "ServerMessage.h"
|
||||
|
||||
#include "common/Settings.h"
|
||||
|
||||
#include "Messages.h"
|
||||
#include "ServerMessage.h"
|
||||
#include "common/Settings.h"
|
||||
|
||||
#include <QMessageBox>
|
||||
#include <QPushButton>
|
||||
@ -65,7 +63,7 @@ void ServerConnection::handleLogLine(const QString &logLine)
|
||||
return;
|
||||
}
|
||||
|
||||
if (Settings::value(Settings::Server::ConfigVisible).toBool()) {
|
||||
if (m_serverConfigDialogVisible) {
|
||||
qDebug("server config dialog visible, skipping new client prompt");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -30,6 +30,10 @@ public:
|
||||
QWidget *parent, IServerConfig &serverConfig, std::shared_ptr<Deps> deps = std::make_shared<Deps>()
|
||||
);
|
||||
void handleLogLine(const QString &logLine);
|
||||
void serverConfigDialogVisible(bool visible)
|
||||
{
|
||||
m_serverConfigDialogVisible = visible;
|
||||
}
|
||||
|
||||
Q_SIGNALS:
|
||||
void messageShowing();
|
||||
@ -45,6 +49,7 @@ private:
|
||||
std::shared_ptr<Deps> m_pDeps;
|
||||
QSet<QString> m_connectedClients;
|
||||
bool m_messageShowing = false;
|
||||
bool m_serverConfigDialogVisible = false;
|
||||
};
|
||||
|
||||
} // namespace deskflow::gui
|
||||
|
||||
Reference in New Issue
Block a user