frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XKB: Trying to copy to the same keymap is not fatal 

Humour the user if they run XkbCopyKeymap(foo, foo).

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Stone 2008-11-27 13:31:18 +11:00
parent d929ba6886
commit 5ee504cae5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xkb/xkbUtils.c
View File

@ -2130,9 +2130,12 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
memset(&changes, 0, sizeof(changes)); memset(&changes, 0, sizeof(changes));
memset(&cause, 0, sizeof(cause)); memset(&cause, 0, sizeof(cause));
if (!src || !dst || src == dst) if (!src || !dst)
return FALSE; return FALSE;
if (src == dst)
return TRUE;
if (!_XkbCopyClientMap(src, dst)) if (!_XkbCopyClientMap(src, dst))
return FALSE; return FALSE;
if (!_XkbCopyServerMap(src, dst)) if (!_XkbCopyServerMap(src, dst))