diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-11-20 12:59:56 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-11-20 12:59:56 +0100 |
| commit | 399aae55aa384bf91dff0fc770497c0d5f935fa9 (patch) | |
| tree | 923811a1111a2fbd8a1f8ae8a4baa40ac553f7ad | |
| parent | a4805a3bb847d96fa31d697e5edca7bb3d40b88d (diff) | |
"Unable to connect to the graphic server" error on guest shutdown
In virt_viewer_app_activate(), priv->connected is set to FALSE when
the connect/active is successfull. However, we rely on it to know
whether the virt_viewer_app_disconnected() is an error, so only set it
to FALSE when connection failed.
Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=875697
| -rw-r--r-- | src/virt-viewer-app.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c index 50a3a2d..6b3ad6d 100644 --- a/src/virt-viewer-app.c +++ b/src/virt-viewer-app.c @@ -890,15 +890,17 @@ virt_viewer_app_activate(VirtViewerApp *self) ret = VIRT_VIEWER_APP_GET_CLASS(self)->activate(self); - if (ret != -1) { - virt_viewer_app_show_status(self, _("Connecting to graphic server")); + if (ret == -1) { priv->connected = FALSE; + } else { + virt_viewer_app_show_status(self, _("Connecting to graphic server")); priv->cancelled = FALSE; priv->active = TRUE; - priv->grabbed = FALSE; - virt_viewer_app_update_title(self); } + priv->grabbed = FALSE; + virt_viewer_app_update_title(self); + return ret; } |