coding

3 files changed, 4 insertions, 6 deletions

diff --git a/iOSClient/FileViewInFolder/NCFileViewInFolder.swift b/iOSClient/FileViewInFolder/NCFileViewInFolder.swift
index 441c62b98..d386e0860 100644
--- a/iOSClient/FileViewInFolder/NCFileViewInFolder.swift
+++ b/iOSClient/FileViewInFolder/NCFileViewInFolder.swift
@@ -47,6 +47,8 @@ class NCFileViewInFolder: NCCollectionViewCommon  {
             self.navigationItem.title = CCUtility.getLastPath(fromServerUrl: serverUrl, urlBase: appDelegate.urlBase)
         }
         
+        appDelegate.activeViewController = self
+        
         (layout, _, _, groupBy, _, titleButton, itemForLine) = NCUtility.shared.getLayoutForView(key: layoutKey, serverUrl: serverUrl)
         gridLayout.itemForLine = CGFloat(itemForLine)
         
diff --git a/iOSClient/Main/NCCollectionViewCommon.swift b/iOSClient/Main/NCCollectionViewCommon.swift
index 236ba5d45..2a48de8ff 100644
--- a/iOSClient/Main/NCCollectionViewCommon.swift
+++ b/iOSClient/Main/NCCollectionViewCommon.swift
@@ -1198,12 +1198,6 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
             } else {
                 NCNetworking.shared.download(metadata: metadataTouch!, selector: selectorLoadFileView) { (_) in }
             }
-            
-            if layoutKey == k_layout_view_viewInFolder {
-                dismiss(animated: true) {
-                    self.appDelegate.activeFileViewInFolder = nil
-                }
-            }
         }
     }
     
diff --git a/iOSClient/Networking/NCNetworkingNotificationCenter.swift b/iOSClient/Networking/NCNetworkingNotificationCenter.swift
index 31eb3cdd5..2311c869f 100644
--- a/iOSClient/Networking/NCNetworkingNotificationCenter.swift
+++ b/iOSClient/Networking/NCNetworkingNotificationCenter.swift
@@ -183,6 +183,8 @@ import Foundation
             (self.appDelegate.activeViewController as! NCOffline).segue(metadata: metadata)
         } else if self.appDelegate.activeViewController is NCRecent {
             (self.appDelegate.activeViewController as! NCRecent).segue(metadata: metadata)
+        } else if self.appDelegate.activeViewController is NCFileViewInFolder {
+            (self.appDelegate.activeViewController as! NCFileViewInFolder).segue(metadata: metadata)
         }
     }