Merge branch 'dev' into hidpi-icons

This commit is contained in:
Hombre
2018-11-29 00:15:57 +01:00
264 changed files with 6738 additions and 5146 deletions

View File

@@ -264,7 +264,7 @@ void ExifPanel::addDirectory (const TagDirectory* dir, Gtk::TreeModel::Children
Tag* t2 = (const_cast<TagDirectory*> (dir))->getTagByIndex (j);
const TagAttrib* currAttrib = t2->getAttrib();
if (currAttrib && ((options.lastShowAllExif) || (!options.lastShowAllExif && currAttrib->action != AC_SYSTEM))) {
if (currAttrib && (options.lastShowAllExif || currAttrib->action != AC_SYSTEM)) {
addSeparator();
hasContent = true;
break;