MixManager: Fix assert and disconnect from right signal

olomono · Apr 22, 2024 · acd49df · acd49df
1 parent 80d10a8
commit acd49df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/client/QXmppMixManager.cpp b/src/client/QXmppMixManager.cpp
@@ -946,14 +946,14 @@ void QXmppMixManager::onRegistered(QXmppClient *client)
     connect(d->discoveryManager, &QXmppDiscoveryManager::infoReceived, this, &QXmppMixManager::handleDiscoInfo);
 
     d->pubSubManager = client->findExtension<QXmppPubSubManager>();
-    Q_ASSERT_X(d->discoveryManager, "QXmppMixManager", "QXmppPubSubManager is missing");
+    Q_ASSERT_X(d->pubSubManager, "QXmppMixManager", "QXmppPubSubManager is missing");
 }
 
 void QXmppMixManager::onUnregistered(QXmppClient *client)
 {
     disconnect(d->discoveryManager, &QXmppDiscoveryManager::infoReceived, this, &QXmppMixManager::handleDiscoInfo);
     resetCachedData();
-    disconnect(client, &QXmppClient::disconnected, this, nullptr);
+    disconnect(client, &QXmppClient::connected, this, nullptr);
 }
 
 bool QXmppMixManager::handlePubSubEvent(const QDomElement &element, const QString &pubSubService, const QString &nodeName)

diff --git a/tests/qxmppmixmanager/tst_qxmppmixmanager.cpp b/tests/qxmppmixmanager/tst_qxmppmixmanager.cpp
@@ -557,7 +557,7 @@ void tst_QXmppMixManager::testOnUnregistered()
     manager.setArchivingSupportedByServer(true);
     manager.addService(service);
 
-    Q_EMIT client.disconnected();
+    Q_EMIT client.connected();
     QVERIFY(manager.supportedByServer());
     QVERIFY(manager.archivingSupportedByServer());
     QVERIFY(!manager.services().isEmpty());