From 14d144ea2251c5b7ae80c7dbbd4f8907bcfa232b Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 10 Jan 2014 17:31:10 -0800
Subject: UI stuff, re-launch app from AppleScript after install (still needs a
 bit of work)

---
 ZeroTierUI/mainwindow.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'ZeroTierUI/mainwindow.cpp')

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);
-- 
cgit v1.2.3