Simplify virt_viewer_initial_connect()

- do not overwrite err if ->initial_connect() sets it
- remove need for waitvm if the display server isn't yet started (note:
  this function might be untested, I am not sure relying on libvirt events
  is enough)

1 files changed, 6 insertions, 6 deletions

diff --git a/src/virt-viewer.c b/src/virt-viewer.c
index 1a64f84..883c823 100644
--- a/src/virt-viewer.c
+++ b/src/virt-viewer.c
@@ -684,13 +684,13 @@ virt_viewer_initial_connect(VirtViewerApp *app, GError **error)
         virt_viewer_app_show_status(app, _("Waiting for guest domain to start"));
         goto wait;
     }
-    ret = virt_viewer_update_display(self, dom);
-    if (ret) {
-        ret = VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->initial_connect(app, &err);
-    if (!ret) {
-        virt_viewer_app_show_status(app, _("Waiting for guest domain to start server"));
+
+    if (!virt_viewer_update_display(self, dom))
         goto wait;
-    }
+
+    ret = VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->initial_connect(app, &err);
+    if (ret || err)
+        goto cleanup;
 
 wait:
     virt_viewer_app_trace(app, "Guest %s has not activated its display yet, waiting "