From: Nate Graham <nate@kde.org>
Date: Sat, 17 Oct 2020 00:35:54 +0000 (-0600)
Subject: Fix DolphinMainWindow::viewContainers() to take into account split views
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/1501825d447bf0d316750368d8579a95a38ce537?ds=sidebyside

Fix DolphinMainWindow::viewContainers() to take into account split views

The function was previously assuming that each tab view has exactly one
view container, which is not necessarily accurate; some could have a
split view open.
---

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 8bc890f04..8d4f50270 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -204,9 +204,14 @@ DolphinMainWindow::~DolphinMainWindow()
 QVector<DolphinViewContainer*> DolphinMainWindow::viewContainers() const
 {
     QVector<DolphinViewContainer*> viewContainers;
-    viewContainers.reserve(m_tabWidget->count());
+
     for (int i = 0; i < m_tabWidget->count(); ++i) {
-        viewContainers << m_tabWidget->tabPageAt(i)->activeViewContainer();
+        DolphinTabPage *tabPage = m_tabWidget->tabPageAt(i);
+
+        viewContainers << tabPage->primaryViewContainer();
+        if (tabPage->splitViewEnabled()) {
+            viewContainers << tabPage->secondaryViewContainer();
+        }
     }
     return viewContainers;
 }