From 23f80689ffd75249f14fb142ccf9001871dd9f63 Mon Sep 17 00:00:00 2001 From: giomfo Date: Thu, 12 Feb 2015 13:35:07 +0100 Subject: [PATCH] Console: BugFix - On iPhone 6+ (landscape mode), keep open the selected room when user changes application tabs. --- .../ViewController/RecentsViewController.m | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/matrixConsole/matrixConsole/ViewController/RecentsViewController.m b/matrixConsole/matrixConsole/ViewController/RecentsViewController.m index a62fe0a6a..89f1970be 100644 --- a/matrixConsole/matrixConsole/ViewController/RecentsViewController.m +++ b/matrixConsole/matrixConsole/ViewController/RecentsViewController.m @@ -148,10 +148,12 @@ - (void)viewDidAppear:(BOOL)animated { [super viewDidAppear:animated]; - // Release potential Room ViewController if none is visible (Note: check on room visibility is required to handle correctly splitViewController) - if ([AppDelegate theDelegate].masterTabBarController.visibleRoomId == nil && currentRoomViewController) { - currentRoomViewController.roomId = nil; - currentRoomViewController = nil; + // Release the current selected room (if any) except if the Room ViewController is still visible (see splitViewController.isCollapsed condition) + if (!self.splitViewController || self.splitViewController.isCollapsed) { + if (currentRoomViewController) { + currentRoomViewController.roomId = nil; + currentRoomViewController = nil; + } } }