From 1501825d447bf0d316750368d8579a95a38ce537 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Fri, 16 Oct 2020 18:35:54 -0600 Subject: [PATCH] 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. --- src/dolphinmainwindow.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 8bc890f04a..8d4f50270b 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -204,9 +204,14 @@ DolphinMainWindow::~DolphinMainWindow() QVector DolphinMainWindow::viewContainers() const { QVector 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; }