From d413cade5e3b8427f0a7ba7513becd66cb7cc5e0 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Wed, 5 Sep 2012 18:13:04 +0200 Subject: protect against the case where the user has removed the disco manager --- src/client/QXmppMucManager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/client/QXmppMucManager.cpp') diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp index 9ca71d77..71fe6c47 100644 --- a/src/client/QXmppMucManager.cpp +++ b/src/client/QXmppMucManager.cpp @@ -208,9 +208,11 @@ QXmppMucRoom::QXmppMucRoom(QXmppClient *client, const QString &jid, QObject *par this, SLOT(_q_presenceReceived(QXmppPresence))); Q_ASSERT(check); - check = connect(d->discoManager, SIGNAL(infoReceived(QXmppDiscoveryIq)), - this, SLOT(_q_discoveryInfoReceived(QXmppDiscoveryIq))); - Q_ASSERT(check); + if (d->discoManager) { + check = connect(d->discoManager, SIGNAL(infoReceived(QXmppDiscoveryIq)), + this, SLOT(_q_discoveryInfoReceived(QXmppDiscoveryIq))); + Q_ASSERT(check); + } // convenience signals for properties check = connect(this, SIGNAL(joined()), this, SIGNAL(isJoinedChanged())); -- cgit v1.2.3