[spice-server] [PATCH v2] cursor: fix wrong logic when initializing the channel

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
Changes since v1:
- Change the condition, as suggested by Frediano, to avoid introducing another logoc error
---
 server/cursor-channel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
2.5.0

_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]     [Monitors]