summaryrefslogtreecommitdiff
path: root/ZeroTierUI/mainwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ZeroTierUI/mainwindow.cpp')
-rw-r--r--ZeroTierUI/mainwindow.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/ZeroTierUI/mainwindow.cpp b/ZeroTierUI/mainwindow.cpp
index 913ced1c..fc434782 100644
--- a/ZeroTierUI/mainwindow.cpp
+++ b/ZeroTierUI/mainwindow.cpp
@@ -82,7 +82,7 @@ static void handleZTMessage(void *arg,unsigned long id,const char *line)
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow),
- pollServiceTimerId(0)
+ pollServiceTimerId(-1)
{
ui->setupUi(this);
if (ui->networkListWidget->verticalScrollBar())
@@ -112,6 +112,8 @@ void MainWindow::timerEvent(QTimerEvent *event)
if (this->isHidden())
return;
+ if (pollServiceTimerId < 0)
+ return;
if (!zeroTierClient) {
std::string authToken;
@@ -331,7 +333,10 @@ void MainWindow::doInstallDialog()
{
#ifdef __APPLE__
this->setEnabled(false);
- this->setHidden(true);
+ if (pollServiceTimerId >= 0) {
+ this->killTimer(pollServiceTimerId);
+ pollServiceTimerId = -1;
+ }
InstallDialog *id = new InstallDialog(this);
id->setModal(true);