| author | mouse <mouse> | 2004-01-09 14:18:03 (UTC) |
|---|---|---|
| committer | mouse <mouse> | 2004-01-09 14:18:03 (UTC) |
| commit | 6875988077013544246ae0df7cc2e5d538a7f152 (patch) (side-by-side diff) | |
| tree | f24c11b218457095d303be1a366423648dc15331 /core/applets/multikeyapplet | |
| parent | 8dd8648b0e82b16bcb0c976d330eaf670081a748 (diff) | |
| download | opie-6875988077013544246ae0df7cc2e5d538a7f152.zip opie-6875988077013544246ae0df7cc2e5d538a7f152.tar.gz opie-6875988077013544246ae0df7cc2e5d538a7f152.tar.bz2 | |
bug fix: range checking in sw_maps
| -rw-r--r-- | core/applets/multikeyapplet/multikey.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp index 9ef162f..d304f54 100644 --- a/core/applets/multikeyapplet/multikey.cpp +++ b/core/applets/multikeyapplet/multikey.cpp @@ -35,12 +35,15 @@ Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current(" lang = 0; QCopEnvelope e("MultiKey/Keyboard", "getmultikey()"); setText("EN"); - popupMenu.insertItem("EN", -1); + popupMenu.insertItem("EN", 0); show(); } void Multikey::mousePressEvent(QMouseEvent *ev) { + if (!sw_maps.count()) + return; + if (ev->button() == RightButton) { QPoint p = mapToGlobal(QPoint(0, 0)); @@ -61,6 +64,9 @@ void Multikey::mousePressEvent(QMouseEvent *ev) void Multikey::mouseReleaseEvent(QMouseEvent *ev) { + if (!sw_maps.count()) + return; + lang = lang < sw_maps.count()-1 ? lang+1 : 0; QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii()); |