Fixed NPE when import menu are empty

cmaglie · cmaglie · commit 17115b0a9b80 · 2015-01-13T23:16:53.000+01:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -988,6 +988,8 @@ public LibraryList getUserLibs() {
   }
 
   public void rebuildImportMenu(JMenu importMenu) {
+    if (importMenu == null)
+      return;
     importMenu.removeAll();
 
     JMenuItem addLibraryMenuItem = new JMenuItem(_("Add Library..."));
@@ -1035,6 +1037,8 @@ public void actionPerformed(ActionEvent e) {
   }
 
   public void rebuildExamplesMenu(JMenu menu) {
+    if (menu == null)
+      return;
     try {
       menu.removeAll();
 

Original file line number	Diff line number	Diff line change
`@@ -988,6 +988,8 @@ public LibraryList getUserLibs() {`
`988`	`988`	`}`
`989`	`989`
`990`	`990`	`public void rebuildImportMenu(JMenu importMenu) {`
	`991`	`+ if (importMenu == null)`
	`992`	`+ return;`
`991`	`993`	`importMenu.removeAll();`
`992`	`994`
`993`	`995`	`JMenuItem addLibraryMenuItem = new JMenuItem(_("Add Library..."));`
`@@ -1035,6 +1037,8 @@ public void actionPerformed(ActionEvent e) {`
`1035`	`1037`	`}`
`1036`	`1038`
`1037`	`1039`	`public void rebuildExamplesMenu(JMenu menu) {`
	`1040`	`+ if (menu == null)`
	`1041`	`+ return;`
`1038`	`1042`	`try {`
`1039`	`1043`	`menu.removeAll();`
`1040`	`1044`