commit 5cce3ba4c58a7f243061cc985e1f0f47aa8db0c7
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Nov 08 23:35:24 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Nov 08 23:35:24 2013 -0800
tree 4c21b1ee7bb417f816638e710b7b15ced839ed68
parent 86240d0d5993e994d7deb7a2ba7532e019952236

Fix segfault on exit

Change-Id: If22fee14e6651f2ec215f764b2daa3c400f0fe63

linux/tray-menu.cpp

diff --git a/linux/tray-menu.cpp b/linux/tray-menu.cpp
index db4b321..1fc0692 100644
--- a/linux/tray-menu.cpp
+++ b/linux/tray-menu.cpp
@@ -602,7 +602,7 @@
 TrayMenu::~TrayMenu()
 {
     daemonStatusTimer->stop();
-    statusUpdateThread->exit();
+    statusUpdateThread->exit(0);
     delete ui;
     delete trayIcon;
     delete trayIconMenu;
@@ -613,7 +613,6 @@
     delete openSecuritySettings;
     delete toolBar;
     delete statusUpdateThread;
-    delete daemonStatusTimer;
     delete dialog;
     delete networkManager;
     delete persistentSettings;