From 077c20ed740705e9a131dbf320136d66de20beb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 11 Jan 2021 13:40:35 +0100
Subject: [PATCH] base: Really fix the holding on across await points issue for
 room names

---
 matrix_sdk_base/src/rooms/normal.rs | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/matrix_sdk_base/src/rooms/normal.rs b/matrix_sdk_base/src/rooms/normal.rs
index 574d8627..f8d3ba58 100644
--- a/matrix_sdk_base/src/rooms/normal.rs
+++ b/matrix_sdk_base/src/rooms/normal.rs
@@ -221,19 +221,26 @@ impl Room {
     /// [spec]:
     /// <https://matrix.org/docs/spec/client_server/latest#calculating-the-display-name-for-a-room>
     async fn calculate_name(&self) -> String {
-        let inner = self.inner.read().unwrap();
+        let name;
+        let alias;
 
-        if let Some(name) = &inner.base_info.name {
+        {
+            let inner = self.inner.read().unwrap();
+            name = inner.base_info.name.clone();
+            alias = inner.base_info.canonical_alias.clone();
+        }
+
+        if let Some(name) = name {
             let name = name.trim();
             name.to_string()
-        } else if let Some(alias) = &inner.base_info.canonical_alias {
+        } else if let Some(alias) = alias {
             let alias = alias.alias().trim();
             alias.to_string()
         } else {
             // TODO what should we do here? We have correct counts only if lazy
             // loading is used.
-            let summary = inner.summary.clone();
-            drop(inner);
+            let summary = { self.inner.read().unwrap().summary.clone() };
+
             let joined = summary.joined_member_count;
             let invited = summary.invited_member_count;
             let heroes_count = summary.heroes.len() as u64;
@@ -267,8 +274,9 @@ impl Room {
                 summary.heroes
             );
 
-            let inner = self.inner.read().unwrap();
-            inner
+            self.inner
+                .read()
+                .unwrap()
                 .base_info
                 .calculate_room_name(joined, invited, members)
         }