From 7e211aa1511b84fd258475471a72c49b55b04467 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Fri, 15 Apr 2011 14:49:58 -0400 Subject: [PATCH] More pause button state fixes Make sure we reset the pause button state _before_ we invoke the operation, otherwise we might overwrite the already updated state --- src/virtManager/details.py | 5 +++-- src/virtManager/manager.py | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/virtManager/details.py b/src/virtManager/details.py index 3ee53fd6d..e56b6b593 100644 --- a/src/virtManager/details.py +++ b/src/virtManager/details.py @@ -1227,6 +1227,9 @@ class vmmDetails(vmmGObjectUI): if self.ignorePause: return + # Let state handler listener change things if necc. + self.set_pause_state(not src.get_active()) + if not self.vm.is_paused(): self.emit("action-suspend-domain", self.vm.get_connection().get_uri(), @@ -1236,8 +1239,6 @@ class vmmDetails(vmmGObjectUI): self.vm.get_connection().get_uri(), self.vm.get_uuid()) - # Let state handler listener change things if necc. - self.set_pause_state(not src.get_active()) def control_vm_run(self, src_ignore): self.emit("action-run-domain", diff --git a/src/virtManager/manager.py b/src/virtManager/manager.py index f69040ec4..7d9025200 100644 --- a/src/virtManager/manager.py +++ b/src/virtManager/manager.py @@ -637,15 +637,15 @@ class vmmManager(vmmGObjectUI): do_pause = src.get_active() + # Set button state back to original value: just let the status + # update function fix things for us + self.set_pause_state(not do_pause) + if do_pause: self.pause_vm(None) else: self.resume_vm(None) - # Set button state back to original value: just let the status - # update function fix things for us - self.set_pause_state(not do_pause) - def start_vm(self, ignore): vm = self.current_vm() if vm is not None: