Merge branch 'react' of https://github.com/atlarge-research/opendc-frontend into react

3 files changed, 14 insertions, 3 deletions

diff --git a/src/components/home/ContactSection.js b/src/components/home/ContactSection.js
index 1ec5e9c7..fd65b31c 100644
--- a/src/components/home/ContactSection.js
+++ b/src/components/home/ContactSection.js
@@ -35,6 +35,17 @@ const ContactSection = () => (
                 </a>.
             </div>
         </div>
+        <div className="row">
+            <div className="col text-center disclaimer mt-5 small">
+                <FontAwesome name="exclamation-triangle" size="2x" className="mr-2"/>
+                <br/>
+                OpenDC is an experimental tool. Your data may get lost, overwritten, or otherwise become unavailable.
+                <br/>
+                The OpenDC authors should in no way be liable in the event this happens (see our <strong><a
+                href="https://github.com/atlarge-research/opendc/blob/master/LICENSE.md">license</a></strong>). Sorry
+                for the inconvenience.
+            </div>
+        </div>
     </ContentSection>
 );
 
diff --git a/src/components/home/ContactSection.sass b/src/components/home/ContactSection.sass
index c292526c..2cde7391 100644
--- a/src/components/home/ContactSection.sass
+++ b/src/components/home/ContactSection.sass
@@ -11,5 +11,5 @@
   .tudelft-icon
     height: 100px
 
-  .fa
-    margin-right: 10px
+  .disclaimer
+    color: #cccccc
diff --git a/src/sagas/experiments.js b/src/sagas/experiments.js
index 5bcd6948..84a748da 100644
--- a/src/sagas/experiments.js
+++ b/src/sagas/experiments.js
@@ -38,7 +38,7 @@ export function* onOpenExperimentSucceeded(action) {
 
 function* startStateFetchLoop(experimentId) {
     try {
-        while (true) {
+        while ((yield select(state => state.currentExperimentId)) !== -1) {
             const lastSimulatedTick = (yield call(getLastSimulatedTick, experimentId)).lastSimulatedTick;
             if (lastSimulatedTick !== (yield select(state => state.lastSimulatedTick))) {
                 yield put(setLastSimulatedTick(lastSimulatedTick));