summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/inputmethods
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-29 12:01:41 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-29 12:01:41 +0200
commitce01064f834830793600cedd554dbe37f71a413c (patch)
treee62d6cef838b924420971ff3f231261246b881eb /src/platformsupport/inputmethods
parent3ffe4283b640825ebf03e2a5506a9d846cc88b11 (diff)
Fix crash if IBus is not configured.
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/platformsupport/inputmethods')
-rw-r--r--src/platformsupport/inputmethods/ibus/qibusplatforminputcontext.cpp8
1 files changed, 5 insertions, 3 deletions
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;
}