From 1c591fe121c5e04b33eddea308f00cec1ef5647b Mon Sep 17 00:00:00 2001 From: George Bateman Date: Sun, 13 Apr 2014 11:42:36 +0100 Subject: [PATCH] Menu mnemonic bug fix I just found out that jmi.getText() can be null, so I added null-checking. --- app/src/processing/app/Toolkit.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java index 3dd7cccc3..5688bfd9e 100644 --- a/app/src/processing/app/Toolkit.java +++ b/app/src/processing/app/Toolkit.java @@ -220,6 +220,7 @@ public class Toolkit { // METHOD 1: attempt to assign KDE defaults. for (JMenuItem jmi : menu) { if (jmi == null) continue; + if (jmi.getText() == null) continue; jmi.setMnemonic(0); // Reset. for (int i = 0; i < kdePreDefStrs.length; i++) { String cleanName = nonAAlpha.matcher(jmi.getText()).replaceAll("").toLowerCase(); @@ -236,6 +237,7 @@ public class Toolkit { algorithmicAssaignment: for (JMenuItem jmi : menu) { if (jmi == null) continue; + if (jmi.getText() == null) continue; if (jmi.getMnemonic() != 0) continue; // Already assigned. // The string can't be made lower-case as that would spoil