[Spice-commits] server/red-worker.cpp

[GitLab Mirror]

 server/red-worker.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 76c59470ef3ad6b76ce5d8f07e5e02df7396b92d
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Wed Jan 27 14:19:56 2021 +0400

    worker: ignore subsequent start messages
    
    If the worker is already started, don't assert and just return.
    
    This fixes calling spice_server_vm_start() multiple times.
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
    Acked-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/server/red-worker.cpp b/server/red-worker.cpp
index 830adc37..31a3731f 100644
--- a/server/red-worker.cpp
+++ b/server/red-worker.cpp
@@ -536,7 +536,10 @@ static void handle_dev_start(void *opaque, void *payload)
 {
     RedWorker *worker = (RedWorker*) opaque;
 
-    spice_assert(!red_qxl_is_running(worker->qxl));
+    if (red_qxl_is_running(worker->qxl)) {
+        return;
+    }
+
     if (worker->cursor_channel) {
         worker->cursor_channel->set_during_target_migrate(FALSE);
     }