From aea998418757eb40eff159b20a7c8d1956c4883f Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Fri, 13 Jun 2025 03:18:01 +0200
Subject: [PATCH] DevicesModel: Do not connect until the value is initialised

When the DevicesModel is open, we get a nullptr instance. I guess it's
obvious that it's null because it hasn't been set yet. Move the connect
to the setter.
---
 src/settings/models/devicesmodel.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/settings/models/devicesmodel.cpp b/src/settings/models/devicesmodel.cpp
index 1610efbe1..163df6111 100644
--- a/src/settings/models/devicesmodel.cpp
+++ b/src/settings/models/devicesmodel.cpp
@@ -18,15 +18,6 @@ using namespace Quotient;
 DevicesModel::DevicesModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    connect(m_connection, &Connection::sessionVerified, this, [this](const QString &, const QString &deviceId) {
-        const auto it = std::find_if(m_devices.begin(), m_devices.end(), [deviceId](const Quotient::Device &device) {
-            return device.deviceId == deviceId;
-        });
-        if (it != m_devices.end()) {
-            const auto index = this->index(it - m_devices.begin());
-            Q_EMIT dataChanged(index, index, {Type});
-        }
-    });
 }
 
 void DevicesModel::fetchDevices()
@@ -162,6 +153,15 @@ void DevicesModel::setConnection(NeoChatConnection *connection)
         disconnect(m_connection, nullptr, this, nullptr);
     }
     m_connection = connection;
+    connect(m_connection, &Connection::sessionVerified, this, [this](const QString &, const QString &deviceId) {
+        const auto it = std::find_if(m_devices.begin(), m_devices.end(), [deviceId](const Quotient::Device &device) {
+            return device.deviceId == deviceId;
+        });
+        if (it != m_devices.end()) {
+            const auto index = this->index(it - m_devices.begin());
+            Q_EMIT dataChanged(index, index, {Type});
+        }
+    });
     Q_EMIT connectionChanged();
     fetchDevices();