Merge pull request #5384 from hazmatsuitor/master

benfry · web-flow · commit b6e3dce86d1e · 2018-03-13T19:55:27.000-04:00
fix NPE when closing sketch window on Mac (#5214)
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -3703,8 +3703,7 @@ public void dispose() {
     if (platform == MACOSX) {
       try {
         final String td = "processing.core.ThinkDifferent";
-        final Class<?> thinkDifferent =
-          Thread.currentThread().getContextClassLoader().loadClass(td);
+        final Class<?> thinkDifferent = getClass().getClassLoader().loadClass(td);
         thinkDifferent.getMethod("cleanup").invoke(null);
       } catch (Exception e) {
         e.printStackTrace();
