Commit 05e2d6fb authored by Michael Reeves's avatar Michael Reeves

Fix syncmode

dirDest as seen from outside DirectoryInfo is always valid.
This is not what we want to check for sync mode.
parent f9bd88a1
......@@ -49,6 +49,8 @@ class DirectoryInfo
return m_dirC.isValid() ? m_dirC : m_dirB;
}
inline bool allowSyncMode() { return !m_dirC.isValid() && !m_dirDest.isValid(); }
inline bool listDirA(const Options& options)
{
return m_dirA.listDir(&m_dirListA,
......
......@@ -1013,7 +1013,7 @@ bool DirectoryMergeWindow::DirectoryMergeWindowPrivate::init(
m_bScanning = true;
emit q->statusBarMessage(i18n("Scanning directories..."));
m_bSyncMode = m_pOptions->m_bDmSyncMode && !dirC.isValid() && !dirDest.isValid();
m_bSyncMode = m_pOptions->m_bDmSyncMode && dirInfo->allowSyncMode();
m_fileMergeMap.clear();
s_eCaseSensitivity = m_bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment