Merge branch 'v1.5.0' into development

pybpod · Oct 31, 2017 · e99a1eb · e99a1eb
2 parents 602c0a6 + ab0ddd7
commit e99a1eb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pybpodapi/bpod/bpod_base.py b/pybpodapi/bpod/bpod_base.py
@@ -22,7 +22,7 @@
 
 from pybpodapi.bpod_modules.bpod_modules import BpodModules
 
-
+from pybpodapi.session import Session
 from pybpodapi.exceptions.bpod_error import BpodErrorException
 
 logger = logging.getLogger(__name__)
@@ -56,6 +56,7 @@ def __init__(self, serial_port=None, sync_channel=None, sync_mode=None):
 		self._hardware.sync_channel = self.sync_channel  # 255 = no sync, otherwise set to a hardware channel number
 		self._hardware.sync_mode    = self.sync_mode 	# 0 = flip logic every trial, 1 = every state
 
+		if not hasattr(self, '_session'): self._session = Session()
 
 		self.session += SessionInfo( self.session.INFO_SERIAL_PORT, self.serial_port )