summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2013-05-17 10:36:05 -0400
committerAlon Levy <alevy@redhat.com>2013-05-17 11:06:34 -0400
commitf844a995bb6c4ac39cd0b115335f27f9ee1b747e (patch)
tree91cdf275746988b9a0bcd27f12206670c7ab31ae
parent97459ddfdb0b1d5456bccb60d0943d94495ac890 (diff)
downloadspice-f844a995bb6c4ac39cd0b115335f27f9ee1b747e.tar.gz
spice-f844a995bb6c4ac39cd0b115335f27f9ee1b747e.tar.xz
spice-f844a995bb6c4ac39cd0b115335f27f9ee1b747e.zip
server/red_worker: turn critical (assert) non error into warning
The situation causing this assert is unknown but it doesn't cause correctness issues with later rendering, and it is causing an abort.
-rw-r--r--server/red_worker.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/server/red_worker.c b/server/red_worker.c
index 8f3e4788..14d219b0 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -11367,7 +11367,10 @@ static void red_push_monitors_config(DisplayChannelClient *dcc)
{
MonitorsConfig *monitors_config = DCC_TO_WORKER(dcc)->monitors_config;
- spice_return_if_fail(monitors_config != NULL);
+ if (monitors_config == NULL) {
+ spice_warning("monitors_config is NULL");
+ return;
+ }
if (!red_channel_client_test_remote_cap(&dcc->common.base,
SPICE_DISPLAY_CAP_MONITORS_CONFIG)) {