client: Simplify some logic in queue_event

Both the blocks in this if/else clause do the same thing, so combine
the comparisons into one.

No functional change.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>

diff --git a/src/wayland-client.c b/src/wayland-client.c
index 3d7361e..8fb2dbd 100644 (file)
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -1228,10 +1228,7 @@ queue_event(struct wl_display *display, int len)
                return 0;
 
        proxy = wl_map_lookup(&display->objects, id);
-       if (proxy == WL_ZOMBIE_OBJECT) {
-               wl_connection_consume(display->connection, size);
-               return size;
-       } else if (proxy == NULL) {
+       if (!proxy || proxy == WL_ZOMBIE_OBJECT) {
                wl_connection_consume(display->connection, size);
                return size;
        }