From ce01064f834830793600cedd554dbe37f71a413c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 29 Jun 2011 12:01:41 +0200 Subject: Fix crash if IBus is not configured. Reviewed-by: Lars Knoll --- .../inputmethods/ibus/qibusplatforminputcontext.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/inputmethods/ibus/qibusplatforminputcontext.cpp b/src/platformsupport/inputmethods/ibus/qibusplatforminputcontext.cpp index f0a3270665..55c0c4b249 100644 --- a/src/platformsupport/inputmethods/ibus/qibusplatforminputcontext.cpp +++ b/src/platformsupport/inputmethods/ibus/qibusplatforminputcontext.cpp @@ -78,8 +78,10 @@ public: QIBusPlatformInputContext::QIBusPlatformInputContext () : d(new QIBusPlatformInputContextPrivate()) { - connect(d->context, SIGNAL(CommitText(QDBusVariant)), SLOT(commitText(QDBusVariant))); - connect(d->context, SIGNAL(UpdatePreeditText(QDBusVariant,uint,bool)), this, SLOT(updatePreeditText(QDBusVariant,uint,bool))); + if (d->context) { + connect(d->context, SIGNAL(CommitText(QDBusVariant)), SLOT(commitText(QDBusVariant))); + connect(d->context, SIGNAL(UpdatePreeditText(QDBusVariant,uint,bool)), this, SLOT(updatePreeditText(QDBusVariant,uint,bool))); + } } QIBusPlatformInputContext::~QIBusPlatformInputContext (void) @@ -213,7 +215,7 @@ QIBusPlatformInputContextPrivate::QIBusPlatformInputContextPrivate() context(0), valid(false) { - if (!connection->isConnected()) { + if (!connection || !connection->isConnected()) { qDebug() << "not connected"; return; } -- cgit v1.2.3