Merge branch 'master' of https://code.df.uba.ar/martindrech/total_control_app

drivers/andorzyla.py

@@ -760,7 +760,16 @@ class AndorBase(SDK3Camera):
             except AttributeError:
                 print('AndorZyla object has no attribute _live_acq_auxs')
             
-            pData, lData = SDK3.WaitBuffer(self.handle, int(timeout))
+            try:
+                pData, lData = SDK3.WaitBuffer(self.handle, int(timeout))
+            except:
+                t.do_run = False
+                
+                self.AcquisitionStop()
+                self._flush()
+                print('camera timeout')
+                t.join()
+                break
             
             img = create_aligned_array(xs*ys, 'uint16')
             SDK3.ConvertBuffer(bufs[self.acq_index_i%len(bufs)].ctypes.data_as(ctypes.POINTER(ctypes.c_uint8)),