bug fix: range checking in sw_maps

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
@@ -36,5 +36,5 @@ Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("
     QCopEnvelope e("MultiKey/Keyboard", "getmultikey()");
     setText("EN");
-    popupMenu.insertItem("EN", -1);
+    popupMenu.insertItem("EN", 0);
     show();
 }
@@ -42,4 +42,7 @@ Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("
 void Multikey::mousePressEvent(QMouseEvent *ev)
 {
+    if (!sw_maps.count())
+        return;
+
     if (ev->button() == RightButton) {
 
@@ -62,4 +65,7 @@ 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)");