aboutsummaryrefslogtreecommitdiff
path: root/src/client/QXmppMucManager.cpp
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-09-05 18:13:04 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-09-05 18:13:04 +0200
commitd413cade5e3b8427f0a7ba7513becd66cb7cc5e0 (patch)
treeabfdb898b9bdd4d9ae01aee3a0069e771b506f0a /src/client/QXmppMucManager.cpp
parentf74b261fad3f06e9e27d5aca7e86d9ca14b5a67a (diff)
downloadqxmpp-d413cade5e3b8427f0a7ba7513becd66cb7cc5e0.tar.gz
protect against the case where the user has removed the disco manager
Diffstat (limited to 'src/client/QXmppMucManager.cpp')
-rw-r--r--src/client/QXmppMucManager.cpp8
1 files changed, 5 insertions, 3 deletions
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()));