Suppressed empty server warning on startup #4240

This commit is contained in:
Xinyu Hou 2014-12-02 15:03:19 +00:00
parent 12ae0da55f
commit ebba77fd33
2 changed files with 8 additions and 2 deletions

View File

@ -88,7 +88,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
m_DownloadMessageBox(NULL), m_DownloadMessageBox(NULL),
m_pCancelButton(NULL), m_pCancelButton(NULL),
m_SuppressAutoConfigWarning(false), m_SuppressAutoConfigWarning(false),
m_BonjourInstall(NULL) m_BonjourInstall(NULL),
m_SuppressEmptyServerWarning(false)
{ {
setupUi(this); setupUi(this);
@ -160,7 +161,9 @@ void MainWindow::open()
// auto hiding before the user has configured synergy (which of course // auto hiding before the user has configured synergy (which of course
// confuses first time users, who think synergy has crashed). // confuses first time users, who think synergy has crashed).
if (appConfig().startedBefore() && appConfig().processMode() == Desktop) { if (appConfig().startedBefore() && appConfig().processMode() == Desktop) {
m_SuppressEmptyServerWarning = true;
startSynergy(); startSynergy();
m_SuppressEmptyServerWarning = false;
} }
} }
@ -541,8 +544,10 @@ bool MainWindow::clientArgs(QStringList& args, QString& app)
if (m_pLineEditHostname->text().isEmpty()) { if (m_pLineEditHostname->text().isEmpty()) {
show(); show();
if (!m_SuppressEmptyServerWarning) {
QMessageBox::warning(this, tr("Hostname is empty"), QMessageBox::warning(this, tr("Hostname is empty"),
tr("Please fill in a hostname for the synergy client to connect to.")); tr("Please fill in a hostname for the synergy client to connect to."));
}
return false; return false;
} }

View File

@ -191,6 +191,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
QMutex m_Mutex; QMutex m_Mutex;
bool m_SuppressAutoConfigWarning; bool m_SuppressAutoConfigWarning;
CommandProcess* m_BonjourInstall; CommandProcess* m_BonjourInstall;
bool m_SuppressEmptyServerWarning;
private slots: private slots:
void on_m_pCheckBoxAutoConfig_toggled(bool checked); void on_m_pCheckBoxAutoConfig_toggled(bool checked);