From ea79500249ef3dbb91501577f5eb2d0f3fbc558e Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Tue, 23 Jul 2002 17:52:51 +0000
Subject: [PATCH] fixed exception on close when trying to create
 sketch.properties on linux and mac

---
 app/PdeBase.java   | 16 +++++++++-------
 app/PdeEditor.java |  9 +++++++--
 todo.txt           |  3 +++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/PdeBase.java b/app/PdeBase.java
index f690bdac0..d8c9f4934 100644
--- a/app/PdeBase.java
+++ b/app/PdeBase.java
@@ -273,13 +273,15 @@ public class PdeBase implements ActionListener {
 	  new SketchbookMenuListener(subPath);
 
 	entries = subFolder.list();
-	for (int j = 0; j < entries.length; j++) {
-	  if ((entries[j].equals(".")) || 
-	      (entries[j].equals(".."))) continue;
-	  //subMenu.add(entries[j]);
-	  MenuItem item = new MenuItem(entries[j]);
-	  item.addActionListener(subMenuListener);
-	  subMenu.add(item);
+	if (entries != null) {
+	  for (int j = 0; j < entries.length; j++) {
+	    if ((entries[j].equals(".")) || 
+		(entries[j].equals(".."))) continue;
+	    //subMenu.add(entries[j]);
+	    MenuItem item = new MenuItem(entries[j]);
+	    item.addActionListener(subMenuListener);
+	    subMenu.add(item);
+	  }
 	}
 
 	menu.add(subMenu);
diff --git a/app/PdeEditor.java b/app/PdeEditor.java
index ce0f43f13..8d47d706c 100644
--- a/app/PdeEditor.java
+++ b/app/PdeEditor.java
@@ -990,9 +990,14 @@ public class PdeEditor extends Panel {
     // write sketch.properties
     try {
       URL url = getClass().getResource("buttons.gif");
-      String urlstr = url.toString();
-      urlstr = urlstr.substring(6, urlstr.lastIndexOf("/") + 1) + 
+      //String urlstr = url.toString();
+      //System.out.println(url.getFile());
+      //urlstr = urlstr.substring(6, urlstr.lastIndexOf("/") + 1) + 
+      //"sketch.properties";
+      String urlstr = url.getFile();
+      urlstr = urlstr.substring(0, urlstr.lastIndexOf("/") + 1) +
 	"sketch.properties";
+
       //System.out.println(urlstr);
       //System.exit(0);
       FileOutputStream output = new FileOutputStream(urlstr);
diff --git a/todo.txt b/todo.txt
index 0ea1cd825..336450dd1 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,6 +1,9 @@
 0036
 X editor.buttons.bgcolor default value was wrong
+X sketch.properties exception when closing on linux and mac
+X   urlstr was garbage because of windows-specific code
 
+_ build macos9 version with JDK13 flag turned off
 _ dbn2p5 converter.. ooh!
 
 bagel