Various bugfix (see #4008) :

1. RT could crash in some circumstances with single frame image
2. UNICODE UserComment now done when already existing in raw file
3. When editing UserComment in the ExifPanel, the Value filed is now
filled with the current value
This commit is contained in:
Hombre57
2017-10-07 00:43:45 +02:00
parent 180912df0f
commit 2ef064f7d4
4 changed files with 29 additions and 9 deletions

View File

@@ -284,11 +284,12 @@ void ExifPanel::addDirectory (const TagDirectory* dir, Gtk::TreeModel::Children
continue;
}
if (t->isDirectory())
if (t->isDirectory()) {
for (int j = 0; t->getDirectory (j); j++) {
Gtk::TreeModel::Children ch = addTag (root, t->nameToString (j), M ("EXIFPANEL_SUBDIRECTORY"), currAttrib ? currAttrib->action : AC_DONTWRITE, currAttrib && currAttrib->editable);
addDirectory (t->getDirectory (j), ch);
} else {
}
} else {
addTag (root, t->nameToString (), t->valueToString (), currAttrib ? (t->getOwnMemory() ? currAttrib->action : AC_SYSTEM) : AC_DONTWRITE, currAttrib && currAttrib->editable);
}
}
@@ -631,11 +632,11 @@ Glib::ustring ExifPanel::getSelection (bool onlyeditable)
while (iter) {
if (first) {
ret = iter->get_value (exifColumns.field_nopango);
editable = iter->get_value (exifColumns.editable);
} else {
ret = iter->get_value (exifColumns.field_nopango) + "." + ret;
}
editable = iter->get_value (exifColumns.editable);
iter = iter->parent ();
first = false;
}