┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNate Graham <[email protected]>2021-07-28 12:54:10 -0600
committerNate Graham <[email protected]>2021-07-28 12:59:29 -0600
commitea7d4f059d5cb81b51053e7fec6492a727a968c2 (patch)
tree703e2aa5ddd7896bc9cb5bd4d9b572a7e69d9ebd
parent0cdcf041cf18db77a74ecd829f2e6bb586aabe08 (diff)
Revert "Don't session-restore invalid paths"
This reverts commit c733b3aa9787a618a0ce5bb03b3fc731f5663b21. There are people who prefer the old behavior of session-restoring all paths including the ones which are currently inaccessible. The idea is that Dolphin is like a web browser; if a website is not currently available, the browser tells you that instead of silently discarding the URL and showing you the homepage. Doing this can be considered a form of data loss. In addition, the reason for the change was to prevent Dolphin from showing invalid paths on launch for unmounted removable disks, but that specific case was fixed separately by switching to ~ for any tabs/views that were showing locations on a just-unmounted removable disk. So you will never run into the problem if yo unmount a disk in Dolphin and then close it. Accordingly, let's revert the change because it causes more problems than it resolves. BUG: 439864 CCBUG: 427619 FIXED-IN: 21.08
-rw-r--r--src/dolphinmainwindow.cpp14
-rw-r--r--src/dolphinmainwindow.h6
-rw-r--r--src/main.cpp4
3 files changed, 0 insertions, 24 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index fe39d4d2f..52b3e8d6a 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -239,20 +239,6 @@ QVector<DolphinViewContainer*> DolphinMainWindow::viewContainers() const
return viewContainers;
}
-void DolphinMainWindow::setViewsWithInvalidPathsToHome()
-{
- const QVector<DolphinViewContainer*> theViewContainers = viewContainers();
- for (DolphinViewContainer *viewContainer : theViewContainers) {
-
- // Only consider local dirs, not remote locations and abstract protocols
- if (viewContainer->url().isLocalFile()) {
- if (!QFileInfo::exists(viewContainer->url().toLocalFile())) {
- viewContainer->setUrl(QUrl::fromLocalFile(QDir::homePath()));
- }
- }
- }
-}
-
void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView)
{
m_tabWidget->openDirectories(dirs, splitView);
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 594c75691..3a29d1c0a 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -105,12 +105,6 @@ public:
*/
void setViewsToHomeIfMountPathOpen(const QString& mountPath);
- /**
- * Sets any of the window's view containers which are currently displaying
- * invalid locations to the home path
- */
- void setViewsWithInvalidPathsToHome();
-
bool isFoldersPanelEnabled() const;
bool isInformationPanelEnabled() const;
diff --git a/src/main.cpp b/src/main.cpp
index fba45f43c..76b482688 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -204,10 +204,6 @@ int main(int argc, char **argv)
if (startedWithURLs) {
mainWindow->openDirectories(urls, splitView);
}
-
- // Now handle invalid locations in the set of active views to
- // avoid issues like https://bugs.kde.org/show_bug.cgi?id=427619
- mainWindow->setViewsWithInvalidPathsToHome();
} else {
qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
}