summaryrefslogtreecommitdiff
path: root/lib/process_xml.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:24:35 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:24:35 +0200
commit460091fb0b2ff114cc741372f15bb43b702ea3b1 (patch)
tree0562c2eda4c66969c6e6d0910080db9f5b0def3e /lib/process_xml.cpp
parent5.15 (diff)
downloadFreeFileSync-460091fb0b2ff114cc741372f15bb43b702ea3b1.tar.gz
FreeFileSync-460091fb0b2ff114cc741372f15bb43b702ea3b1.tar.bz2
FreeFileSync-460091fb0b2ff114cc741372f15bb43b702ea3b1.zip
5.16
Diffstat (limited to 'lib/process_xml.cpp')
-rw-r--r--lib/process_xml.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/process_xml.cpp b/lib/process_xml.cpp
index 4974dcbc..78a40159 100644
--- a/lib/process_xml.cpp
+++ b/lib/process_xml.cpp
@@ -980,12 +980,12 @@ void readConfig(const XmlIn& in, xmlAccess::XmlGuiConfig& config)
warn_static("remove after migration?")
if (inGuiCfg["SyncPreviewActive"]) //obsolete name
- inGuiCfg["SyncPreviewActive"](config.showSyncAction);
+ inGuiCfg["SyncPreviewActive"](config.highlightSyncAction);
else
{
std::string val;
if (inGuiCfg["MiddleGridView"](val)) //refactor into enum!?
- config.showSyncAction = val == "Action";
+ config.highlightSyncAction = val == "Action";
}
}
@@ -1124,7 +1124,7 @@ void readConfig(const Zstring& filename, XmlType type, ConfigType& cfg, int curr
{
XmlDoc doc;
loadXmlDocument(filename, doc); //throw FfsXmlError
-
+
if (getXmlType(doc) != type) //throw()
throw FfsXmlError(replaceCpy(_("File %x does not contain a valid configuration."), L"%x", fmtFileName(filename)));
@@ -1376,7 +1376,7 @@ void writeConfig(const XmlGuiConfig& config, XmlOut& out)
outGuiCfg["HideExcluded" ](config.hideExcludedItems);
outGuiCfg["HandleError" ](config.handleError);
- outGuiCfg["MiddleGridView"](config.showSyncAction ? "Action" : "Category"); //refactor into enum!?
+ outGuiCfg["MiddleGridView"](config.highlightSyncAction ? "Action" : "Category"); //refactor into enum!?
}
void writeConfig(const XmlBatchConfig& config, XmlOut& out)
bgstack15