Merge branch 'master' of github.com:quantopian/zipline

zipline/simulator.py

@@ -57,7 +57,6 @@ class Simulator(ComponentHost):
         self.running = True
 
         return thread
-        
 
     def did_clean_shutdown(self):
         return not any([t.isAlive() for t in self.subthreads])
@@ -70,8 +69,6 @@ class Simulator(ComponentHost):
         if not self.running:
             return
 
-        if self.controller:
-            self.controller.shutdown()
 
         for component in self.components.itervalues():
             component.shutdown()
@@ -80,6 +77,8 @@ class Simulator(ComponentHost):
             if thread.is_alive():
                 thread._Thread__stop()
 
+        #self.controller.shutdown()
+
         self.running = False
 
         assert self.did_clean_shutdown()