Water no longer posted to Alyx if experiment is aborted

Author: k1o0

+eui/ExpPanel.m

@@ -206,7 +206,7 @@ function expStarted(obj, rig, evt)
       end
     end
 
-    function expStopped(obj, rig, ~)
+    function expStopped(obj, rig, evt)
       % EXPSTOPPED Callback for the ExpStopped event.
       %   expStopped(obj, rig, event) Updates the ExpRunning flag, the
       %   panel title and status label to show that the experiment has
@@ -222,8 +222,9 @@ function expStopped(obj, rig, ~)
       obj.Root.TitleColor = [1 0.3 0.22]; % red title area
       %post water to Alyx
       ai = rig.AlyxInstance;
+      aborted = evt.Data; % aborted experiment flag
       subject = obj.SubjectRef;
-      if ~isempty(ai)&&~strcmp(subject,'default')
+      if ~isempty(ai)&&~strcmp(subject,'default')&&~aborted
           switch class(obj)
               case 'eui.ChoiceExpPanel'
                   if ~isfield(obj.Block.trial,'feedbackType'); return; end % No completed trials

+srv/StimulusControl.m

@@ -198,8 +198,8 @@ function onWSReceived(obj, ~, eventArgs)
                 notify(obj, 'ExpStarting', srv.ExpEvent('starting', ref));
               case 'completed'
                 %experiment stopped without any exceptions
-                ref = data{2};
-                notify(obj, 'ExpStopped', srv.ExpEvent('completed', ref));
+                ref = data{2}; aborted = data{3};
+                notify(obj, 'ExpStopped', srv.ExpEvent('completed', ref, aborted));
               case 'expException'
                 %experiment stopped with an exception
                 ref = data{2}; err = data{3};

+srv/expServer.m

@@ -203,7 +203,7 @@ function handleMessage(id, data, host)
               experiment.AlyxInstance = AlyxInstance;
             end
             experiment.quit(immediately);
-            send(communicator, id, []);
+            send(communicator, id, immediately);
           else
             log('Quit message received but no experiment is running\n');
           end