From e9d33f83881a66357de6641ab7e746887d7a91ba Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Mon, 24 Apr 2017 12:06:24 -0400
Subject: [PATCH] Stop clobbering loading projects with default data

If the app is loading with an initial project id, don't try to load the default project. Previously, this data would load on top of the project being loaded.

Does not fix the issue of blocks not loading in the blocks pane, which appears to be separate.
---
 src/index.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/index.jsx b/src/index.jsx
index 6670dbe74..0e0c4af1e 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -19,7 +19,7 @@ class App extends React.Component {
         this.updateProject = this.updateProject.bind(this);
         this.state = {
             projectId: null,
-            projectData: JSON.stringify(ProjectLoader.DEFAULT_PROJECT_DATA)
+            projectData: this.fetchProjectId().length ? null : ProjectLoader.DEFAULT_PROJECT_DATA
         };
     }
     componentDidMount () {
@@ -49,6 +49,7 @@ class App extends React.Component {
         }
     }
     render () {
+        if (this.state.projectData === null) return null;
         return (
             <GUI
                 basePath={this.props.basePath}