diff options
| author | Pavel Grunt <pgrunt@redhat.com> | 2016-03-29 17:08:28 +0200 |
|---|---|---|
| committer | Pavel Grunt <pgrunt@redhat.com> | 2016-03-29 17:52:07 +0200 |
| commit | 0f3c872a84ea38aba9b2144005cda9e4f177d23a (patch) | |
| tree | 74907cbb4643e3336bcde302ed4c9d3116745636 | |
| parent | 02c4cd59a45844b938a8c5b647538d01d4f040a0 (diff) | |
widget: Avoid combining ternary with another operators
Logical operators like "&&" has higher precedency than "?:".
Readiness of SpiceDisplay was wrongly determined due to missing
parentheses around the ternary operator.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=94738
Acked-by: Victor Toso <victortoso@redhat.com>
| -rw-r--r-- | src/spice-widget.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/spice-widget.c b/src/spice-widget.c index 21b1c14..f605439 100644 --- a/src/spice-widget.c +++ b/src/spice-widget.c @@ -230,14 +230,15 @@ static gint get_display_id(SpiceDisplay *display) static void update_ready(SpiceDisplay *display) { SpiceDisplayPrivate *d = display->priv; - gboolean ready; + gboolean ready = FALSE; - ready = d->monitor_ready && + if (d->monitor_ready) { #ifndef G_OS_WIN32 - d->egl.enabled ? d->egl.image != NULL : + ready = d->egl.enabled ? d->egl.image != NULL : d->mark != 0; +#else + ready = d->mark != 0; #endif - d->mark; - + } /* If the 'resize-guest' property is set, the application expects spice-gtk * to manage the size and state of the displays, so update the 'enabled' * state here. If 'resize-guest' is false, we can assume that the |