shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-03-12 20:58:17 +03:00
Code Issues Projects Releases Wiki Activity

Fix virt_viewer_app_activate return value

Browse Source 
VirtViewerApp::activate is expected to return -1 on errors.
It calls the VirtViewerSession::open_* methods, which return FALSE
on error. However, VirtViewerApp::activate directly returns these
boolean instead of testing the returned value and properly returning
-1 on errors. This caused errors in these open methodes to be ignored.
This commit is contained in:
Christophe Fergeau 2012-06-05 14:09:12 +02:00
parent afb278958e
commit 3ce6df7c30
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/virt-viewer-app.c
View File

@ -846,15 +846,18 @@ virt_viewer_app_default_activate(VirtViewerApp *self)
#endif
if (fd >= 0) {
return virt_viewer_session_open_fd(VIRT_VIEWER_SESSION(priv->session), fd);
if (virt_viewer_session_open_fd(VIRT_VIEWER_SESSION(priv->session), fd))
return 0;
} else if (priv->guri) {
virt_viewer_app_trace(self, "Opening connection to display at %s\n", priv->guri);
return virt_viewer_session_open_uri(VIRT_VIEWER_SESSION(priv->session), priv->guri);
if (virt_viewer_session_open_uri(VIRT_VIEWER_SESSION(priv->session), priv->guri))
return 0;
} else {
virt_viewer_app_trace(self, "Opening direct TCP connection to display at %s:%s:%s\n",
priv->ghost, priv->gport, priv->gtlsport ? priv->gtlsport : "-1");
return virt_viewer_session_open_host(VIRT_VIEWER_SESSION(priv->session),
priv->ghost, priv->gport, priv->gtlsport);
if (virt_viewer_session_open_host(VIRT_VIEWER_SESSION(priv->session),
priv->ghost, priv->gport, priv->gtlsport))
return 0;
}
return -1;