tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Open app prefs: avoid erasing a user custom value while applying changes when there is no recoll default: the mime would completely disappear from the list

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-03-11 10:20:27 +01:00
parent 46d3117a4d
commit b00f7127a9
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qtgui/viewaction_w.cpp
View File

@ -207,8 +207,19 @@ void ViewAction::editActions()
} }
} }
// An empty action will restore the default (erase from // An empty action will restore the default (erase from
// topmost conftree) // topmost conftree). IF there is no default in the system
// files, and the entry only came from the user file, it will
// be erased and the mime will go away from the list, which is
// not what we want ! This not trivial to test because
// rclconfig has no way to tell us if the value comes from the
// system config or the user file. So just check if the value
// disappears after setting it, and restore it if it does.
string oldvalue = theconfig->getMimeViewerDef(entry, "", 0);
theconfig->setMimeViewerDef(entry, sact); theconfig->setMimeViewerDef(entry, sact);
string newvalue = theconfig->getMimeViewerDef(entry, "", 0);
if (!oldvalue.empty() && newvalue.empty()) {
theconfig->setMimeViewerDef(entry, oldvalue);
}
} }
theconfig->setMimeViewerAllEx(viewerXs); theconfig->setMimeViewerAllEx(viewerXs);