Fixed codition with side effects

(cherry picked from commit 1a02af5a12b400fcb6ad121a0a71e4440c2e9152)

diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c
index 4b9799e..507305f 100644 (file)
--- a/channels/drdynvc/client/drdynvc_main.c
+++ b/channels/drdynvc/client/drdynvc_main.c
@@ -580,10 +580,15 @@ static UINT dvcman_open_channel(drdynvcPlugin* drdynvc, IWTSVirtualChannelManage
        {
                pCallback = channel->channel_callback;
 
-               if ((pCallback->OnOpen) && (error = pCallback->OnOpen(pCallback)))
+               if (pCallback->OnOpen)
                {
-                       WLog_Print(drdynvc->log, WLOG_ERROR, "OnOpen failed with error %" PRIu32 "!", error);
-                       return error;
+                       error = pCallback->OnOpen(pCallback);
+                       if (error)
+                       {
+                               WLog_Print(drdynvc->log, WLOG_ERROR, "OnOpen failed with error %" PRIu32 "!",
+                                          error);
+                               return error;
+                       }
                }
 
                WLog_Print(drdynvc->log, WLOG_DEBUG, "open_channel: ChannelId %" PRIu32 "", ChannelId);