From aed1440d267f043cfd5bc632cff3758f7cd4bf1e Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 5 Oct 2022 19:20:14 +0200
Subject: Don't let old server lookups overwrite new ones

---
 src/LoginPage.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/LoginPage.cpp')

diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp
index b288066b..567e8c82 100644
--- a/src/LoginPage.cpp
+++ b/src/LoginPage.cpp
@@ -108,7 +108,13 @@ LoginPage::onMatrixIdEntered()
         emit homeserverChanged();
 
         http::client()->well_known(
-          [this](const mtx::responses::WellKnown &res, mtx::http::RequestErr err) {
+          [this, orginal_hostname = user.hostname()](const mtx::responses::WellKnown &res,
+                                                     mtx::http::RequestErr err) {
+              // Ignore if server changed
+              auto currentUser = parse<User>(mxid_.toStdString());
+              if (currentUser.hostname() != orginal_hostname)
+                  return;
+
               if (err) {
                   if (err->status_code == 404) {
                       nhlog::net()->info("Autodiscovery: No .well-known.");
-- 
cgit 1.5.1