From 6875988077013544246ae0df7cc2e5d538a7f152 Mon Sep 17 00:00:00 2001
From: mouse <mouse>
Date: Fri, 09 Jan 2004 14:18:03 +0000
Subject: bug fix: range checking in sw_maps

---
(limited to 'core/applets/multikeyapplet/multikey.cpp')

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());
--
cgit v0.9.0.2