From d5981978a134a7f04a184148e205caf4d1726a7b Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 21 Dec 2011 14:15:03 -0800 Subject: [PATCH] Resuming works better --- lib/vagrant/action/vm/resume.rb | 2 +- lib/vagrant/vm.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vagrant/action/vm/resume.rb b/lib/vagrant/action/vm/resume.rb index 496d9c0dc..bf62c8b3e 100644 --- a/lib/vagrant/action/vm/resume.rb +++ b/lib/vagrant/action/vm/resume.rb @@ -7,7 +7,7 @@ module Vagrant end def call(env) - if env[:vm].vm.saved? + if env[:vm].state == :saved env[:ui].info I18n.t("vagrant.actions.vm.resume.resuming") env[:action_runner].run(Boot, env) end diff --git a/lib/vagrant/vm.rb b/lib/vagrant/vm.rb index 312efa17f..3a22c6b55 100644 --- a/lib/vagrant/vm.rb +++ b/lib/vagrant/vm.rb @@ -127,7 +127,7 @@ module Vagrant def start(options=nil) return if state == :running - return resume if @vm.saved? + return resume if state == :saved run_action(:start, options) end