From f103b9cf433e76d04ecb0b721571f040ddae5fc5 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Wed, 27 Aug 2014 17:03:37 -0700 Subject: [PATCH] Fixed crash when getting container data. --- meteor/client/stylesheets/dashboard.import.less | 1 + meteor/server/apps.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meteor/client/stylesheets/dashboard.import.less b/meteor/client/stylesheets/dashboard.import.less index 708e78e759..916d4abe3b 100755 --- a/meteor/client/stylesheets/dashboard.import.less +++ b/meteor/client/stylesheets/dashboard.import.less @@ -148,6 +148,7 @@ } min-height: @dashboard-content-height; max-height: @dashboard-content-height; + overflow-x: hidden; overflow-y: overlay; } .nav-tabs > li, diff --git a/meteor/server/apps.js b/meteor/server/apps.js index 01a44ac441..3f253afbd6 100755 --- a/meteor/server/apps.js +++ b/meteor/server/apps.js @@ -104,7 +104,7 @@ recoverApps = function (callback) { } var container = docker.getContainer(app.docker.Id); container.inspect(function (err, data) { - if (app.status !== 'STARTING' && !data.State.Running) { + if (app.status !== 'STARTING' && data && data.State && !data.State.Running) { console.log('restarting: ' + app.name); console.log(app.docker.Id); Fiber(function () {