From 7a31ea526e65c9a1b163da7ba00c8c87e8695969 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Fri, 23 Apr 2021 22:44:23 +0200
Subject: [PATCH] Widget navigation button still visible with settings set to
 integration disabled

---
 CHANGES.rst                            | 2 +-
 Riot/Modules/Room/RoomViewController.m | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 87be3bf7f..09ca2db7d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,7 +8,7 @@ Changes to be released in next version
  * 
 
 🐛 Bugfix
- * 
+ * RoomVC: Widget navigation button still visible with settings set to integration disabled (#4261).
 
 ⚠️ API Changes
  * 
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 8b3a14c21..5b327a55d 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -4298,6 +4298,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
 
 - (NSUInteger)widgetsCount:(BOOL)includeUserWidgets
 {
+    if (!RiotSettings.shared.roomInfoScreenShowIntegrations)
+    {
+        return 0;
+    }
+
     NSUInteger widgetsCount = [[WidgetManager sharedManager] widgetsNotOfTypes:@[kWidgetTypeJitsiV1, kWidgetTypeJitsiV2]
                                                                         inRoom:self.roomDataSource.room
                                                                  withRoomState:self.roomDataSource.roomState].count;