From 5ee504cae5f17d16ee7599beaa4b1944a9a8aee6 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 27 Nov 2008 13:31:18 +1100 Subject: [PATCH] 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 Signed-off-by: Peter Hutterer --- xkb/xkbUtils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 19be1cfb0..12ef1207c 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -2130,9 +2130,12 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies) memset(&changes, 0, sizeof(changes)); memset(&cause, 0, sizeof(cause)); - if (!src || !dst || src == dst) + if (!src || !dst) return FALSE; + if (src == dst) + return TRUE; + if (!_XkbCopyClientMap(src, dst)) return FALSE; if (!_XkbCopyServerMap(src, dst))