[Spice-commits] server/cursor-channel.c

Frediano Ziglio fziglio at kemper.freedesktop.org
Wed Nov 4 03:21:54 PST 2015


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

New commits:
commit 3cc2513d33c19875711c651a18eb5ae4bdb7fa96
Author: Fabiano FidĂȘncio <fidencio at redhat.com>
Date:   Wed Nov 4 12:18:32 2015 +0100

    cursor: fix wrong logic when initializing the channel
    
    It's a regression introduced by commit e601e920bd5. The logic error was
    introduced when trying to achieve the following code[0]. but rewritten
    to prefer an early return, which was wrogly negated.
    
    [0]:
    if (cursor_is_connected(worker)
        && !COMMON_CHANNEL(worker->cursor_channel)->during_target_migrate) {
            red_channel_pipes_add_type(RED_CHANNEL(worker->cursor_channel),
                                       PIPE_ITEM_TYPE_CURSOR_INIT);
    }
    
    Signed-off-by: Fabiano FidĂȘncio <fidencio at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/cursor-channel.c b/server/cursor-channel.c
index 5995aa5..6d648b1 100644
--- a/server/cursor-channel.c
+++ b/server/cursor-channel.c
@@ -556,7 +556,7 @@ void cursor_channel_init(CursorChannel *cursor, CursorChannelClient *client)
 {
     spice_return_if_fail(cursor);
 
-    if (red_channel_is_connected(&cursor->common.base)
+    if (!red_channel_is_connected(&cursor->common.base)
         || COMMON_CHANNEL(cursor)->during_target_migrate) {
         spice_debug("during_target_migrate: skip init");
         return;


More information about the Spice-commits mailing list