summaryrefslogtreecommitdiff
path: root/ZeroTierUI/mainwindow.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-01-03 14:03:29 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-01-03 14:03:29 -0800
commit22b52858e04c25709081251300fed6cdc42810be (patch)
tree1e821cee94f151c3d4c74116dee388611b933ade /ZeroTierUI/mainwindow.cpp
parentbaea75f2dfa21ca76a9b6eb2be83e0681f0024b0 (diff)
downloadinfinitytier-22b52858e04c25709081251300fed6cdc42810be.tar.gz
infinitytier-22b52858e04c25709081251300fed6cdc42810be.zip
Fix -h in zerotier-cli and move code to find auth token into LocalClient, also move auth token for mac into Mac-standard Library/Application Support location.
Diffstat (limited to 'ZeroTierUI/mainwindow.cpp')
-rw-r--r--ZeroTierUI/mainwindow.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/ZeroTierUI/mainwindow.cpp b/ZeroTierUI/mainwindow.cpp
index d935d045..4028b789 100644
--- a/ZeroTierUI/mainwindow.cpp
+++ b/ZeroTierUI/mainwindow.cpp
@@ -79,6 +79,10 @@ void MainWindow::timerEvent(QTimerEvent *event)
{
event->accept();
+#ifdef __APPLE__
+#else
+#endif
+
if (!zeroTierClient) {
std::string dotAuthFile((QDir::homePath() + QDir::separator() + ".zeroTierOneAuthToken").toStdString());
std::string authToken;