From 22f579a59e3ff94078217dff9259fc9a830b4316 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Fri, 13 Mar 2015 19:40:52 +0100
Subject: [PATCH] Restore keyboard mapping only if we actually changed it.

---
 src/autotype/x11/AutoTypeX11.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp
index d2d3acf0..80a9d523 100644
--- a/src/autotype/x11/AutoTypeX11.cpp
+++ b/src/autotype/x11/AutoTypeX11.cpp
@@ -59,7 +59,9 @@ AutoTypePlatformX11::AutoTypePlatformX11()
 void AutoTypePlatformX11::unload()
 {
     // Restore the KeyboardMapping to its original state.
-    AddKeysym(NoSymbol);
+    if (m_currentRemapKeysym != NoSymbol) {
+        AddKeysym(NoSymbol);
+    }
 
     if (m_keysymTable) {
         XFree(m_keysymTable);