Suppressed auto connect warning on startup #4240

This commit is contained in:
Xinyu Hou 2014-11-27 17:32:04 +00:00
parent 9ef6c87857
commit af4817d075
2 changed files with 6 additions and 2 deletions

View File

@ -85,7 +85,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
m_pZeroconfService(NULL),
m_pDataDownloader(NULL),
m_DownloadMessageBox(NULL),
m_pCancelButton(NULL)
m_pCancelButton(NULL),
m_SuppressAutoConnectWarning(false)
{
setupUi(this);
@ -115,7 +116,9 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
setMinimumSize(size());
#endif
m_SuppressAutoConnectWarning = true;
m_pCheckBoxAutoConnect->setChecked(appConfig.autoConnect());
m_SuppressAutoConnectWarning = false;
m_pComboServerList->hide();
}
@ -970,7 +973,7 @@ void MainWindow::on_m_pButtonApply_clicked()
void MainWindow::on_m_pCheckBoxAutoConnect_toggled(bool checked)
{
if (!isBonjourRunning() && checked) {
if (!isBonjourRunning() && checked && !m_SuppressAutoConnectWarning) {
int r = QMessageBox::information(
this, tr("Synergy"),
tr("Auto connect feature requires Bonjour.\n\n"

View File

@ -187,6 +187,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
QMessageBox* m_DownloadMessageBox;
QAbstractButton* m_pCancelButton;
QMutex m_Mutex;
bool m_SuppressAutoConnectWarning;
private slots:
void on_m_pComboServerList_currentIndexChanged(QString );