- ui.labelCoreVersion->setText(_coreInfo["quasselVersion"].toString());
- ui.labelCoreVersionDate->setText(_coreInfo["quasselBuildDate"].toString()); // "BuildDate" for compatibility
- ui.labelClientCount->setNum(_coreInfo["sessionConnectedClients"].toInt());
-
- /*
- qWarning() << _coreInfo["sessionConnectedClientData"];
-
- int lastPeerId = -1;
- QMap<QString, QVariant> lastPeerData;
- for (const auto &peerData : _coreInfo["sessionConnectedClientData"].toList()) {
- lastPeerData = peerData.toMap();
- lastPeerId = lastPeerData["id"].toInt();
+ // CoreInfo object has been recreated, or this is the first time the dialog's been shown
+
+ CoreInfo* coreInfo = Client::coreInfo();
+ // Listen for changes to core information
+ connect(coreInfo, &CoreInfo::coreDataChanged, this, &CoreInfoDlg::coreInfoChanged);
+
+ // Update with any known core information set before connecting the signal. This is needed for
+ // both modern (0.13+) and legacy cores.
+ coreInfoChanged(coreInfo->coreData());
+}
+
+void CoreInfoDlg::coreInfoChanged(const QVariantMap& coreInfo)
+{
+ if (coreInfo.isEmpty()) {
+ // We're missing data for some reason
+ if (Client::isConnected()) {
+ // Core info is entirely empty despite being connected. Something's probably wrong.
+ ui.labelCoreVersion->setText(tr("Unknown"));
+ ui.labelCoreVersionDate->setText(tr("Unknown"));
+ }
+ else {
+ // We're disconnected. Mark as such.
+ ui.labelCoreVersion->setText(tr("Disconnected from core"));
+ ui.labelCoreVersionDate->setText(tr("Not available"));
+ }
+ ui.labelClientCount->setNum(0);
+ // Don't return, allow the code below to remove any existing session widgets