markluffel / Corkbird / changeset / 10b3470c861c

@@ -39,8 +39,9 @@ public class Corkbird {
     this.parent = sketch;
     this.metadata = new DoodleMetadata(); // TODO: load from the page, or locally from... directory path?
     if(sketch.online || true) {
       storage = new RemoteStorage("localhost:8080");
       //storage = new RemoteStorage("corkbird.org");
       //storage = new RemoteStorage("localhost:8080");
       // TODO: pull this from params or something instead
       storage = new RemoteStorage("corkbird.org");
     } else {
       storage = new LocalStorage(sketch);
+    }
@@ -74,12 +75,16 @@ public class Corkbird {
    */
   public void draw() {
     if(shouldSaveNow) {
       // set false first so that if an error occurs, we don't loop indefinitely
       shouldSaveNow = false;
       _save();
       shouldSaveNow = false;
+    }
     if(shouldLoadIdNow != null) {
-      _load(shouldLoadIdNow);
+      String loadId = shouldLoadIdNow;
       // null out first so that errors don't loop indefinitely
       shouldLoadIdNow = null;
       _load(loadId);
       parent.requestFocus();
+    }
+  }

@@ -51,7 +51,10 @@ public class CorkbirdUI {
+    }
     PApplet s = sketch;
-    if(s.mouseX < UI_WIDTH && s.mouseY > uiTop) {
+    boolean hovering = s.mouseX < UI_WIDTH && s.mouseY > uiTop
                     && s.mouseX >= 0 && s.mouseY <= sketchHeight;
     if(hovering) {
       s.cursor(PConstants.HAND);
       if(s.mousePressed) {
         s.image(savePressed, 0, uiTop);