trigger "When I am stopped" when programmatically calling "stop all"

history.txt

@@ -4137,3 +4137,7 @@ in development:
 ------
 * Blocks, Objects: new experimental "When I am stopped" event option
 * Threads: Prevent terminated threads from forking new ones and from cloning
+
+180609
+------
+* Objects, Threads: Also trigger "When I am stopped" when programmatically calling "stop all"

objects.js

@@ -83,7 +83,7 @@ BlockEditorMorph, BlockDialogMorph, PrototypeHatBlockMorph, localize,
 TableMorph, TableFrameMorph, normalizeCanvas, BooleanSlotMorph, HandleMorph,
 AlignmentMorph, Process, XML_Element, VectorPaintEditorMorph*/
 
-modules.objects = '2018-June-08';
+modules.objects = '2018-June-09';
 
 var SpriteMorph;
 var StageMorph;
@@ -4855,7 +4855,11 @@ SpriteMorph.prototype.mouseScroll = function (y) {
     return this.receiveUserInteraction('scrolled-' + (y > 0 ? 'up' : 'down'));
 };
 
-SpriteMorph.prototype.receiveUserInteraction = function (interaction, now) {
+SpriteMorph.prototype.receiveUserInteraction = function (
+    interaction,
+    rightAway,
+    threadSafe
+) {
     var stage = this.parentThatIsA(StageMorph),
         procs = [],
         myself = this,
@@ -4866,11 +4870,11 @@ SpriteMorph.prototype.receiveUserInteraction = function (interaction, now) {
         procs.push(stage.threads.startProcess(
             block,
             myself,
-            stage.isThreadSafe,
+            threadSafe || stage.isThreadSafe,
             null, // export result
             null, // callback
             null, // is clicked
-            now // immediately
+            rightAway // immediately
         ));
     });
     return procs;
@@ -6961,10 +6965,10 @@ StageMorph.prototype.fireStopAllEvent = function () {
 StageMorph.prototype.runStopScripts = function () {
     // experimental: Allow each sprite to run one last step before termination
     // usage example: Stop a robot or device associated with the sprite
-    this.receiveUserInteraction('stopped', true);
+    this.receiveUserInteraction('stopped', true, true);
     this.children.forEach(function (morph) {
         if (morph instanceof SpriteMorph) {
-            morph.receiveUserInteraction('stopped', true);
+            morph.receiveUserInteraction('stopped', true, true);
         }
     });
 };

threads.js

@@ -62,7 +62,7 @@ StageMorph, SpriteMorph, StagePrompterMorph, Note, modules, isString, copy,
 isNil, WatcherMorph, List, ListWatcherMorph, alert, console, TableMorph,
 TableFrameMorph, ColorSlotMorph, isSnapObject*/
 
-modules.threads = '2018-May-08';
+modules.threads = '2018-June-09';
 
 var ThreadManager;
 var Process;
@@ -1854,6 +1854,7 @@ Process.prototype.doStopAll = function () {
         if (stage) {
             stage.threads.resumeAll(stage);
             stage.keysPressed = {};
+            stage.runStopScripts();
             stage.threads.stopAll();
             stage.stopAllActiveSounds();
             stage.children.forEach(function (morph) {