Merge pull request #89 from marcobarilari/marco_clean-cleanUP

remove EyeLink('Shutdown') from clean up

Author: Remi-Gau

src/cleanUp.m

@@ -16,12 +16,6 @@ function cleanUp()
     % Screen Close All
     sca;
 
-    % Shut down connection with Eyelink
-    try
-        Eyelink('shutdown');
-    catch
-    end
-
     % Close Psychportaudio if open
     if PsychPortAudio('GetOpenDeviceCount') ~= 0
         PsychPortAudio('Close');

src/eyeTracker.m

@@ -228,19 +228,22 @@
     %  Exit program if this fails.
     elInit  = Eyelink('Initialize');
     if elInit ~= 0
+        Eyelink('shutdown');
         error([newline 'Eyelink is not initialized, aborted.']);
     end
 
     % Make sure EL is still connected: returns 1 if connected, -1 if dummy-connected,
     %  2 if broadcast-connected and 0 if not connected. Exit program if this fails.
     elConnection = Eyelink('IsConnected');
     if elConnection ~= 1
+        Eyelink('shutdown');
         error([newline 'Eyelink is not connected, aborted.']);
     end
 
     % Initialize Eyelink system and connection: returns 1 when succesful, 0
     % otherwise
     if ~EyelinkInit(0, 1)
+        Eyelink('shutdown');
         fprintf('Eyelink Init aborted.\n');
         return
     end