diff options
| author | Alon Levy <alevy@redhat.com> | 2013-05-17 10:36:13 -0400 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2013-05-17 11:06:34 -0400 |
| commit | 3ace9a3333c72495b2ea674fc663473611d8144d (patch) | |
| tree | 1663143b8bbd301ea069c4566777da12101921d3 | |
| parent | 7d6e813b2c3009d124edf97e557598a69a6b4fc4 (diff) | |
| download | spice-3ace9a3333c72495b2ea674fc663473611d8144d.tar.gz spice-3ace9a3333c72495b2ea674fc663473611d8144d.tar.xz spice-3ace9a3333c72495b2ea674fc663473611d8144d.zip | |
server/red_worker: simplify monitors_config update
| -rw-r--r-- | server/red_worker.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index 14d219b0..f047d299 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -1279,6 +1279,9 @@ static MonitorsConfig *monitors_config_getref(MonitorsConfig *monitors_config) static void monitors_config_decref(MonitorsConfig *monitors_config) { + if (!monitors_config) { + return; + } if (--monitors_config->refs > 0) { return; } @@ -11339,9 +11342,7 @@ static void worker_update_monitors_config(RedWorker *worker, MonitorsConfig *monitors_config; int i; - if (worker->monitors_config) { - monitors_config_decref(worker->monitors_config); - } + monitors_config_decref(worker->monitors_config); spice_debug("monitors config %d(%d)", dev_monitors_config->count, @@ -11396,12 +11397,10 @@ static void set_monitors_config_to_primary(RedWorker *worker) DrawContext *context; if (!worker->surfaces[0].context.canvas) { - spice_warning("%s: no primary surface", __FUNCTION__); + spice_warning("no primary surface"); return; } - if (worker->monitors_config) { - monitors_config_decref(worker->monitors_config); - } + monitors_config_decref(worker->monitors_config); context = &worker->surfaces[0].context; worker->monitors_config = spice_malloc(sizeof(*worker->monitors_config) + sizeof(QXLHead)); |