[X2Go-Commits] [x2gokdrive] 02/02: x2gokdriveremote.c: Possibly a regression fix for f5cbefa0. Clarify variable usage by renaming inner variables width and height.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 875c7d32acb9ff2414d5029afecb20bf87572fca
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 21 17:46:27 2019 +0200

    x2gokdriveremote.c: Possibly a regression fix for f5cbefa0. Clarify variable usage by renaming inner variables width and height.
---
 x2gokdriveremote.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c
index d2e7833..4b9cbff 100644
--- a/x2gokdriveremote.c
+++ b/x2gokdriveremote.c
@@ -1537,7 +1537,6 @@ void *send_frame_thread (void *threadid)
                 struct sendqueue_element* current = NULL;
                 uint32_t  x, y = 0;
                 int32_t width, height = 0;
-                uint32_t crc = 0;
 
                 if(remoteVars.maxfr<elems)
                 {
@@ -1564,13 +1563,13 @@ void *send_frame_thread (void *threadid)
 
                 if(frame)
                 {
-                    crc = frame->crc;
-                    width=frame->width;
-                    height=frame->height;
+                    uint32_t crc = frame->crc;
+                    uint32_t frame_width=frame->width;
+                    uint32_t frame_height=frame->height;
 
                     /* unlock sendqueue for main thread */
                     pthread_mutex_unlock(&remoteVars.sendqueue_mutex);
-                    send_frame(width, height, x, y, crc, frame->regions);
+                    send_frame(frame_width, frame_height, x, y, crc, frame->regions);
                 }
                 else
                 {

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git