summaryrefslogtreecommitdiffstats
path: root/tdecore/tdeshortcut.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-11-29 14:54:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-11-29 14:54:15 -0600
commit05e764aa4c991949a0249ffdaa203f7292c7b138 (patch)
treedfed706502bde32ba7b6d7609c599e64b923b283 /tdecore/tdeshortcut.cpp
parent72849e2a6f973af3eeaa573a66635e37cc427bb0 (diff)
downloadtdelibs-05e764aa4c991949a0249ffdaa203f7292c7b138.tar.gz
tdelibs-05e764aa4c991949a0249ffdaa203f7292c7b138.zip
Do not grab wrong key when AltGr sequence is required to access global accelerator sequence character
This resolves Bug 1676
Diffstat (limited to 'tdecore/tdeshortcut.cpp')
-rw-r--r--tdecore/tdeshortcut.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/tdecore/tdeshortcut.cpp b/tdecore/tdeshortcut.cpp
index bae897e98..86b532f9c 100644
--- a/tdecore/tdeshortcut.cpp
+++ b/tdecore/tdeshortcut.cpp
@@ -70,8 +70,9 @@ bool KKey::init( int keyQt )
//if( sym.initQt( keyQt )
if( KKeyServer::keyQtToSym( keyQt, m_sym )
- && KKeyServer::keyQtToMod( keyQt, m_mod ) )
+ && KKeyServer::keyQtToMod( keyQt, m_mod ) ) {
return true;
+ }
else {
m_sym = 0;
m_mod = 0;
@@ -422,8 +423,10 @@ bool TDEShortcut::init( int keyQt )
if( keyQt ) {
m_nSeqs = 1;
m_rgseq[0].init( TQKeySequence(keyQt) );
- } else
+ }
+ else {
clear();
+ }
return true;
}