[Spice-commits] server/stream.c

Jonathon Jongsma jjongsma at kemper.freedesktop.org
Thu Mar 3 21:30:11 UTC 2016


 server/stream.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 968d7df719db01b9f3670b84c3efc1d9746e4a5c
Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Mar 3 21:22:30 2016 +0100

    server: Fix the order of the attach_stream() asserts
    
    Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/server/stream.c b/server/stream.c
index e6da168..59d4bde 100644
--- a/server/stream.c
+++ b/server/stream.c
@@ -263,8 +263,8 @@ static void attach_stream(DisplayChannel *display, Drawable *drawable, Stream *s
     DisplayChannelClient *dcc;
     RingItem *item, *next;
 
-    spice_assert(!drawable->stream && !stream->current);
     spice_assert(drawable && stream);
+    spice_assert(!drawable->stream && !stream->current);
     stream->current = drawable;
     drawable->stream = stream;
     stream->last_time = drawable->creation_time;


More information about the Spice-commits mailing list