From c75bc2188e76717af1cf01f15572bfac69ddde93 Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Fri, 8 May 2015 20:53:31 -0700
Subject: [PATCH] version bump

---
 package.json                       | 4 ++--
 src/components/Containers.react.js | 2 --
 src/stores/SetupStore.js           | 5 ++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 920c0e3df5..e0ea500094 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Kitematic",
-  "version": "0.5.23",
+  "version": "0.5.24",
   "author": "Kitematic",
   "description": "Simple Docker Container management for Mac OS X.",
   "homepage": "https://kitematic.com/",
@@ -47,7 +47,7 @@
       "<rootDir>/node_modules/source-map-support"
     ]
   },
-  "docker-version": "1.6.0",
+  "docker-version": "1.6.1",
   "docker-machine-version": "0.2.0",
   "electron-version": "0.24.0",
   "virtualbox-version": "4.3.26",
diff --git a/src/components/Containers.react.js b/src/components/Containers.react.js
index 25e603c5f1..97a48806e5 100644
--- a/src/components/Containers.react.js
+++ b/src/components/Containers.react.js
@@ -71,8 +71,6 @@ var Containers = React.createClass({
       this.context.router.transitionTo('containerHome', {name: name});
     } else if (status === 'pending' && ContainerStore.pending()) {
       this.context.router.transitionTo('pull');
-    } else if (status === 'destroy') {
-      this.onDestroy();
     }
   },
   handleScroll: function (e) {
diff --git a/src/stores/SetupStore.js b/src/stores/SetupStore.js
index 3ba6dd9e84..1263c2e920 100644
--- a/src/stores/SetupStore.js
+++ b/src/stores/SetupStore.js
@@ -63,7 +63,10 @@ var _steps = [{
   run: Promise.coroutine(function* (progressCallback) {
     setupUtil.simulateProgress(this.seconds, progressCallback);
     var exists = yield machine.exists();
-    if (!exists) {
+    if (!exists || (yield machine.state()) === 'Error') {
+      if ((yield machine.state()) === 'Error') {
+        yield machine.rm();
+      }
       yield machine.create();
       if(util.isWindows()) {
         let home = util.home();