Bugfix: Could not hide folders in recursive compare (#2528749)
Bugfix: Folder Compare:Copy Right/Left don't create folder
structure (#2529517)
+ Bugfix: Must Show Different to Show L/R Unique (#2129561)
Translation updates:
- Brazilian (#2524796)
- Chinese Traditional (#2540115)
// Subfolders in non-recursive compare can only be skipped or unique
if (!m_bRecursive)
{
- // result filters
- if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors)
- return FALSE;
-
// left/right filters
if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
return FALSE;
if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
return FALSE;
+
+ // result filters
+ if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors)
+ return FALSE;
}
else // recursive (perhaps tree?) mode
{
+ // left/right filters
+ if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
+ return FALSE;
+ if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
+ return FALSE;
+
// result filters
if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors)
return FALSE;
return FALSE;
if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT))
return FALSE;
- // left/right filters
- if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
- return FALSE;
- if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
- return FALSE;
-
}
}
else
{
+ // left/right filters
+ if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
+ return FALSE;
+ if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
+ return FALSE;
+
// file type filters
if (di.diffcode.isBin() && !GetOptionsMgr()->GetBool(OPT_SHOW_BINARIES))
return FALSE;
return FALSE;
if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT))
return FALSE;
-
- // left/right filters
- if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
- return FALSE;
- if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
- return FALSE;
}
return TRUE;
}