From 7a6b9e76e312c8004742d72fa37f5edbcafe9075 Mon Sep 17 00:00:00 2001
From: Martin H <textshell-I1QKlO@neutronstar.dyndns.org>
Date: Fri, 10 Apr 2009 17:35:50 +0000
Subject: [PATCH] netinterface.cpp: Fix assert in shutdown by calling the
 NetTracker constructor from the right thread

git-svn-id: http://delta.affinix.com/svn/trunk/iris@527 ac7a513c-5e3a-0410-af42-968c3ac6e7dc
---
 src/irisnet/corelib/netinterface.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/irisnet/corelib/netinterface.cpp b/src/irisnet/corelib/netinterface.cpp
index 2c6b3058..231880be 100644
--- a/src/irisnet/corelib/netinterface.cpp
+++ b/src/irisnet/corelib/netinterface.cpp
@@ -57,6 +57,7 @@ class NetTracker : public QObject {
 	}
 
 	~NetTracker() {
+		QMutexLocker locker(&m);
 		delete c;
 	}
 
@@ -135,7 +136,6 @@ class NetTrackerThread : public QThread {
 
 	~NetTrackerThread() {
 		// locked from caller
-		delete nettracker;
 	}
 
 
@@ -166,6 +166,8 @@ class NetTrackerThread : public QThread {
 			startCond.wakeOne(); // we're ready to serve.
 		}
 		exec();
+		delete nettracker;
+		nettracker = 0;
 	}
 
 private: