Changeset 312

Timestamp:

12/07/11 09:21:48 (9 years ago)

Author:

sc

Message:

Server:

• changed order of stopping services to properly disconnect from NeuroSky? MindWave?

File:

• trunk/Puzzlebox/Synapse/Server.py (modified) (2 diffs)

trunk/Puzzlebox/Synapse/Server.py

@@ -9 +9 @@
 
 __changelog__ = """\
-Last Update: 2011.12.04
+Last Update: 2011.12.06
 """
 
@@ -670 +670 @@
                                         print e
                 
+                if self.protocol != None:
+                        self.protocol.exitThread()
+                
                 if self.serial_device != None:
                         self.serial_device.exitThread()
                 
+                #if self.protocol != None:
+                        #self.protocol.exitThread()
+                
+                self.socket.close()
+                
+                if callThreadQuit:
+                        QtCore.QThread.quit(self)
+                
+                if self.parent == None:
+                        sys.exit()
+        
+        
+        ##################################################################
+        
+        def resetDevice(self):
+                
+                if self.serial_device != None:
+                        self.serial_device.exitThread()
+                
                 if self.protocol != None:
                         self.protocol.exitThread()
                 
-                self.socket.close()
-                
-                if callThreadQuit:
-                        QtCore.QThread.quit(self)
-                
-                if self.parent == None:
-                        sys.exit()
-        
-        
-        ##################################################################
-        
-        def resetDevice(self):
-                
-                if self.serial_device != None:
-                        self.serial_device.exitThread()
-                
-                if self.protocol != None:
-                        self.protocol.exitThread()
-                
                 self.configureEEG()