Merge pull request #15373 from MarcusDenker/15372-backport-Pharo11-sa…

…fer-morph-access-in-NECMenuMorphmouseDown-14356 15372-backport-Pharo11-safer-morph-access-in-NECMenuMorphmouseDown-14356
pharo-project · Nov 15, 2023 · f3b81e5 · f3b81e5
2 parents b3af3f2 + ba11cc8
commit f3b81e5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/NECompletion-Morphic/NECMenuMorph.class.st b/src/NECompletion-Morphic/NECMenuMorph.class.st
@@ -518,9 +518,13 @@ NECMenuMorph >> mouseDown: evt [
 	super mouseDown: evt.
 	evt wasHandled: false.
 	self flag: #pharoFixMe "ugly hack".
-	engine editor morph owner owner
-		takeKeyboardFocus;
-		handleMouseDown: evt.
+	engine editor morph ifNotNil: [ :aMorph | 
+		aMorph owner ifNotNil: [ :anOwner | 
+			anOwner owner ifNotNil: [ :ownersOwner |
+				ownersOwner
+					takeKeyboardFocus;
+					handleMouseDown: evt.
+		 ] ] ].
 	self close
 ]