Merge pull request #40 from austin2118ace/cal_fix

Fix crash on emulator load

Author: sanworks

Bpod.m

@@ -109,8 +109,6 @@ function Bpod(varargin)
         end
     end
 end
-BpodLib.calibration.liquid.io.report(BpodSystem.CalibrationTables.LiquidCal)
-BpodLib.path.verifyPathing(BpodSystem);
 
 function emulator_setup(varargin)
 % Runs setup with emulator mode flag set to 'true'.
@@ -129,6 +127,9 @@ function emulator_setup(varargin)
 BpodSystem.Status.Initialized = true;
 evalin('base', 'global BpodSystem')
 
+BpodLib.calibration.liquid.io.report(BpodSystem.CalibrationTables.LiquidCal)
+BpodLib.path.verifyPathing(BpodSystem);
+
 function emulator_dialog
 % Launches a GUI indicating that hardware connection has failed.
 % Prompts the user to start emulator mode or close the program.

Functions/+BpodLib/+utils/getCurrentCOM.m

@@ -34,7 +34,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %}
 
-if isempty(BpodSystem.SerialPort)
+if ~isfield(BpodSystem, 'SerialPort')
     comport = 'EMU';
 else
     comport = BpodSystem.SerialPort.PortName;