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
@@ -22,58 +22,64 @@
 #include <qlabel.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qcopchannel_qws.h>
 
 Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN")
 {
     QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this);
     connect( swChannel, SIGNAL(received(const QCString &, const QByteArray &)),
 	     this, SLOT(message(const QCString &, const QByteArray &)));
 
     setFont( QFont( "Helvetica", 10, QFont::Normal ) );
     QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold);
     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));
 	QSize s = popupMenu.sizeHint();
 	int opt = popupMenu.exec(QPoint(p.x() + (width() / 2) - (s.width() / 2),
 					p.y() - s.height()), 0);
 
 	if (opt == -1)
 	    return;
 	lang = opt;
 
 	QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
 	e << sw_maps[lang];
         setText(labels[lang]);
     }
     QWidget::mousePressEvent(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());
     e << sw_maps[lang];
     setText(labels[lang]);
 }
 
 void Multikey::message(const QCString &message, const QByteArray &data)
 {
     if ( message == "setsw(QString,QString)" ) {
 
 	QDataStream stream(data, IO_ReadOnly);
 	QString maps, current_map;
 	stream >> maps >> current_map;
 	QStringList sw = QStringList::split(QChar('|'), maps);
 	sw.append(current_map);