[gnome-boxes] machine: Reset connecting_cancellable before connecting
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] machine: Reset connecting_cancellable before connecting
- Date: Tue, 23 Apr 2013 14:47:51 +0000 (UTC)
commit 3c0a19b397e04ed8f96e666fa2ee2e08734b9a1b
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Fri Apr 19 23:03:30 2013 +0300
machine: Reset connecting_cancellable before connecting
This fixes a regression from 993952e that disabled Boxes from connecting
to the same box more than once.
https://bugzilla.gnome.org/show_bug.cgi?id=698387
src/libvirt-machine.vala | 2 ++
src/ovirt-machine.vala | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/src/libvirt-machine.vala b/src/libvirt-machine.vala
index c0d5799..13c55e7 100644
--- a/src/libvirt-machine.vala
+++ b/src/libvirt-machine.vala
@@ -23,6 +23,8 @@ private class Boxes.LibvirtMachine: Boxes.Machine {
}
public override async void connect_display (Machine.ConnectFlags flags) throws GLib.Error {
+ connecting_cancellable.reset ();
+
yield start (flags, connecting_cancellable);
if (connecting_cancellable.is_cancelled ()) {
connecting_cancellable.reset ();
diff --git a/src/ovirt-machine.vala b/src/ovirt-machine.vala
index 0b39ca2..048a36f 100644
--- a/src/ovirt-machine.vala
+++ b/src/ovirt-machine.vala
@@ -26,6 +26,8 @@ private class Boxes.OvirtMachine: Boxes.Machine {
if (display != null)
return;
+ connecting_cancellable.reset ();
+
if (state == MachineState.STOPPED)
try {
yield vm.start_async (proxy, connecting_cancellable);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]