[Spice-devel] [PATCH spice-gtk] widget: Use parentheses around ternary conditional

Pavel Grunt pgrunt at redhat.com
Tue Mar 29 13:03:03 UTC 2016


"&&" has higher precedency than "?:"

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=94738
---
 src/spice-widget.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/spice-widget.c b/src/spice-widget.c
index 21b1c14..67a9cc1 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -232,12 +232,11 @@ static void update_ready(SpiceDisplay *display)
     SpiceDisplayPrivate *d = display->priv;
     gboolean ready;
 
-    ready = d->monitor_ready &&
 #ifndef G_OS_WIN32
-        d->egl.enabled ? d->egl.image != NULL :
+    ready = d->monitor_ready && (d->egl.enabled ? d->egl.image != NULL : d->mark != 0);
+#else
+    ready = d->monitor_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
-- 
2.7.4



More information about the Spice-devel mailing list