Merge Commit

This commit is contained in:
robvde 2014-08-31 09:39:11 +08:00
commit 7ffed2b786
89 changed files with 8740 additions and 1881 deletions

View file

@ -1989,10 +1989,10 @@ exit", Convert.ToInt32(objDisk["Index"])));
#region Stop
else if (!started &&
(vps.State == VirtualMachineState.Started
(vps.State == VirtualMachineState.Running
|| vps.State == VirtualMachineState.Paused))
{
if (vps.State == VirtualMachineState.Started)
if (vps.State == VirtualMachineState.Running)
{
// try to shutdown the system
ReturnCode code = ShutDownVirtualMachine(vm.VirtualMachineId, true, "Virtual Machine has been suspended from WebsitePanel");