Skip to content

GitLab

KDiff3
KDiff3
Commit 228d3e53 authored by Michael Reeves's avatar Michael Reeves
Browse files
Options

Don't enable choose CEverywhere menu item for two way

parent 3fb42e62
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/directorymergewindow.cpp
View file @ 228d3e53
...@@ -3445,13 +3445,13 @@ void DirectoryMergeWindow::updateAvailabilities(bool bDirCompare, bool bDiffWind ...@@ -3445,13 +3445,13 @@ void DirectoryMergeWindow::updateAvailabilities(bool bDirCompare, bool bDiffWind
d->m_pDirRescan->setEnabled(bDirCompare); d->m_pDirRescan->setEnabled(bDirCompare);
bool bThreeDirs = d->isThreeWay();
d->m_pDirAutoChoiceEverywhere->setEnabled(bDirCompare && isVisible()); d->m_pDirAutoChoiceEverywhere->setEnabled(bDirCompare && isVisible());
d->m_pDirDoNothingEverywhere->setEnabled(bDirCompare && isVisible()); d->m_pDirDoNothingEverywhere->setEnabled(bDirCompare && isVisible());
d->m_pDirChooseAEverywhere->setEnabled(bDirCompare && isVisible()); d->m_pDirChooseAEverywhere->setEnabled(bDirCompare && isVisible());
d->m_pDirChooseBEverywhere->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()); MergeFileInfos* pMFI = d->getMFI(currentIndex());
......
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