From c58226ce4f40c5c475728587f5a735a75f8be901 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sat, 14 Oct 2017 12:49:29 +0200 Subject: [PATCH] Fix Q_OS_WIN ifdef This should fix my previous commit. --- src/dolphinmainwindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 07e80d5869..41c51b9dd8 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1004,9 +1004,9 @@ void DolphinMainWindow::setUrlAsCaption(const QUrl& url) setWindowTitle(schemePrefix + fileName); } -#ifndef Q_OS_WIN void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mountPath) { +#ifndef Q_OS_WIN if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) { m_tearDownFromPlacesRequested = true; m_terminalPanel->goHome(); @@ -1014,16 +1014,18 @@ void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mo } else { m_placesPanel->proceedWithTearDown(); } +#endif } void DolphinMainWindow::slotStorageTearDownExternallyRequested(const QString& mountPath) { +#ifndef Q_OS_WIN if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) { m_tearDownFromPlacesRequested = false; m_terminalPanel->goHome(); } -} #endif +} void DolphinMainWindow::setupActions() {