[X2Go-Commits] [nx-libs] 112/219: xkb: fix what looks to be a copy-paste error with first vs firstMM

[git-admin at x2go.org]

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

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 5be6d271ba4f4c48d0441cf0ed3d8909a6ffd774
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Fri Jun 21 11:22:28 2019 +0200

    xkb: fix what looks to be a copy-paste error with first vs firstMM
    
      commit 758393951233d1b2520cf4cefd33ec4288a3880a
      Author: Dave Airlie <airlied at redhat.com>
      Date:   Wed Sep 12 11:09:40 2018 +1000
    
        xkb: fix what looks to be a copy-paste error with first vs firstMM
    
        Pointed out by coverity.
    
        Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 nx-X11/programs/Xserver/xkb/xkb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c
index e6521c952..238b0897e 100644
--- a/nx-X11/programs/Xserver/xkb/xkb.c
+++ b/nx-X11/programs/Xserver/xkb/xkb.c
@@ -2363,7 +2363,7 @@ ProcXkbSetMap(ClientPtr client)
 	else first= last= 0;
 	if (change.map.num_modmap_keys>0) {
 	    firstMM= change.map.first_modmap_key;
-	    lastMM= first+change.map.num_modmap_keys-1;
+	    lastMM= firstMM + change.map.num_modmap_keys - 1;
 	}
 	else firstMM= lastMM= 0;
 	if ((last>0) && (lastMM>0)) {

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