diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index 8c6d810dcf1e82a2fd1cff52705ea5b906c6ed81..6c10b2b6dec67fe0653919aa59712e9bf24efb38 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -3445,13 +3445,13 @@ void DirectoryMergeWindow::updateAvailabilities(bool bDirCompare, bool bDiffWind d->m_pDirRescan->setEnabled(bDirCompare); + bool bThreeDirs = d->isThreeWay(); d->m_pDirAutoChoiceEverywhere->setEnabled(bDirCompare && isVisible()); d->m_pDirDoNothingEverywhere->setEnabled(bDirCompare && isVisible()); d->m_pDirChooseAEverywhere->setEnabled(bDirCompare && isVisible()); d->m_pDirChooseBEverywhere->setEnabled(bDirCompare && isVisible()); - d->m_pDirChooseCEverywhere->setEnabled(bDirCompare && isVisible()); + d->m_pDirChooseCEverywhere->setEnabled(bDirCompare && isVisible() && bThreeDirs); - bool bThreeDirs = d->isThreeWay(); MergeFileInfos* pMFI = d->getMFI(currentIndex());