This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Suppressed empty server warning on startup #4240

  • Loading branch information...
Xinyu Hou
Xinyu Hou committed Dec 2, 2014
1 parent 12ae0da commit ebba77fd33f4c9ab347fe72ff6f530eff08297b7
Showing with 8 additions and 2 deletions.
  1. +7 −2 src/gui/src/MainWindow.cpp
  2. +1 −0 src/gui/src/MainWindow.h
@@ -88,7 +88,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
m_DownloadMessageBox(NULL),
m_pCancelButton(NULL),
m_SuppressAutoConfigWarning(false),
- m_BonjourInstall(NULL)
+ m_BonjourInstall(NULL),
+ m_SuppressEmptyServerWarning(false)
{
setupUi(this);
@@ -160,7 +161,9 @@ void MainWindow::open()
// auto hiding before the user has configured synergy (which of course
// confuses first time users, who think synergy has crashed).
if (appConfig().startedBefore() && appConfig().processMode() == Desktop) {
+ m_SuppressEmptyServerWarning = true;
startSynergy();
+ m_SuppressEmptyServerWarning = false;
}
}
@@ -541,8 +544,10 @@ bool MainWindow::clientArgs(QStringList& args, QString& app)
if (m_pLineEditHostname->text().isEmpty()) {
show();
- QMessageBox::warning(this, tr("Hostname is empty"),
+ if (!m_SuppressEmptyServerWarning) {
+ QMessageBox::warning(this, tr("Hostname is empty"),
tr("Please fill in a hostname for the synergy client to connect to."));
+ }
return false;
}
View
@@ -191,6 +191,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
QMutex m_Mutex;
bool m_SuppressAutoConfigWarning;
CommandProcess* m_BonjourInstall;
+ bool m_SuppressEmptyServerWarning;
private slots:
void on_m_pCheckBoxAutoConfig_toggled(bool checked);

0 comments on commit ebba77f

Please sign in to comment.