From c20bb27b67c88f7dfb9df5b7e1d028b03074e67b Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Thu, 6 Jan 2022 15:18:10 +1100
Subject: [PATCH] [client] main: move checkUUID to after informational prints
 are done

This change makes the client print the check failure as the last thing
before disconnecting making it more obvious to the user.
---
 client/src/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/main.c b/client/src/main.c
index 2810a1cd..f014e44e 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -847,7 +847,6 @@ static void checkUUID(void)
     return;
 
   DEBUG_ERROR("UUIDs do not match, you have connected SPICE to the wrong guest");
-  DEBUG_ERROR("Shutting down");
   g_state.state = APP_STATE_SHUTDOWN;
 }
 
@@ -1359,7 +1358,6 @@ restart:
 
         memcpy(g_state.guestUUID, vmInfo->uuid, sizeof(g_state.guestUUID));
         g_state.guestUUIDValid = true;
-        checkUUID();
         break;
       }
 
@@ -1395,8 +1393,10 @@ restart:
     udataSize -= record->size;
   }
 
-  DEBUG_INFO("Host ready, reported version: %s", udata->hostver);
-  DEBUG_INFO("Starting session");
+  checkUUID();
+
+  if (g_state.state == APP_STATE_RUNNING)
+    DEBUG_INFO("Starting session");
 
   g_state.kvmfrFeatures = udata->features;