Room::checkVersion(): be tolerant to already upgraded rooms

quotient-im · Mar 10, 2019 · 8c685b4 · 8c685b4
1 parent b467b08
commit 8c685b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/connection.cpp b/lib/connection.cpp
@@ -271,8 +271,7 @@ void Connection::reloadCapabilities()
         Q_ASSERT(!d->capabilities.roomVersions.omitted());
         emit capabilitiesLoaded();
         for (auto* r: d->roomMap)
-            if (r->joinState() == JoinState::Join && r->successorId().isEmpty())
-                r->checkVersion();
+            r->checkVersion();
     });
 }
 

diff --git a/lib/room.cpp b/lib/room.cpp
@@ -1634,7 +1634,7 @@ void Room::checkVersion()
 {
     const auto defaultVersion = connection()->defaultRoomVersion();
     const auto stableVersions = connection()->stableRoomVersions();
-    Q_ASSERT(!defaultVersion.isEmpty() && successorId().isEmpty());
+    Q_ASSERT(!defaultVersion.isEmpty());
     // This method is only called after the base state has been loaded
     // or the server capabilities have been loaded.
     emit stabilityUpdated(defaultVersion, stableVersions);