From 94664e413b089dbc23b206a9a98a73a334a684d3 Mon Sep 17 00:00:00 2001 From: Xinyu Hou Date: Wed, 29 Jul 2015 14:31:47 -0700 Subject: [PATCH] Rename update zeroconf mutex --- src/gui/src/MainWindow.cpp | 2 +- src/gui/src/MainWindow.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 162320b6..7c55d7a6 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -939,7 +939,7 @@ void MainWindow::changeEvent(QEvent* event) void MainWindow::updateZeroconfService() { - QMutexLocker locker(&m_Mutex); + QMutexLocker locker(&m_UpdateZeroconfMutex); if (isBonjourRunning()) { if (!m_AppConfig.wizardShouldRun()) { diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 94c20c6d..6d03326c 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -201,7 +201,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase DataDownloader* m_pDataDownloader; QMessageBox* m_DownloadMessageBox; QAbstractButton* m_pCancelButton; - QMutex m_Mutex; + QMutex m_UpdateZeroconfMutex; bool m_SuppressAutoConfigWarning; CommandProcess* m_BonjourInstall; bool m_SuppressEmptyServerWarning;