diff --git a/rtgui/batchtoolpanelcoord.cc b/rtgui/batchtoolpanelcoord.cc index 55d9f3c79..db06ea59e 100644 --- a/rtgui/batchtoolpanelcoord.cc +++ b/rtgui/batchtoolpanelcoord.cc @@ -126,7 +126,7 @@ void BatchToolPanelCoordinator::initSession () pparams = selected[0]->getProcParams (); coarse->initBatchBehavior (); - + int w,h; selected[0]->getOriginalSize(w,h); crop->setDimensions (w, h); @@ -707,11 +707,11 @@ void BatchToolPanelCoordinator::spotWBselected (int x, int y, Thumbnail* thm) double otemp = initialPP[i].wb.temperature; double ogreen = initialPP[i].wb.green; - if (options.baBehav[12]) { + if (options.baBehav[ADDSET_ROTATE_DEGREE]) { temp = temp - otemp; } - if (options.baBehav[13]) { + if (options.baBehav[ADDSET_DIST_AMOUNT]) { green = green - ogreen; } diff --git a/rtgui/options.cc b/rtgui/options.cc index c267c4651..d75f5d94f 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -1283,27 +1283,27 @@ void Options::readFromFile(Glib::ustring fname) if (keyFile.has_key("GUI", "HistogramPosition")) { histogramPosition = keyFile.get_integer("GUI", "HistogramPosition"); } - + if (keyFile.has_key("GUI", "HistogramRed")) { histogramRed = keyFile.get_boolean("GUI", "HistogramRed"); } - + if (keyFile.has_key("GUI", "HistogramGreen")) { histogramGreen = keyFile.get_boolean("GUI", "HistogramGreen"); } - + if (keyFile.has_key("GUI", "HistogramBlue")) { histogramBlue = keyFile.get_boolean("GUI", "HistogramBlue"); } - + if (keyFile.has_key("GUI", "HistogramLuma")) { histogramLuma = keyFile.get_boolean("GUI", "HistogramLuma"); } - + if (keyFile.has_key("GUI", "HistogramChroma")) { histogramChroma = keyFile.get_boolean("GUI", "HistogramChroma"); } - + if (keyFile.has_key("GUI", "HistogramRAW")) { histogramRAW = keyFile.get_boolean("GUI", "HistogramRAW"); } @@ -1311,11 +1311,11 @@ void Options::readFromFile(Glib::ustring fname) if (keyFile.has_key("GUI", "HistogramBar")) { histogramBar = keyFile.get_boolean("GUI", "HistogramBar"); } - + if (keyFile.has_key ("GUI", "HistogramHeight")) { histogramHeight = keyFile.get_integer ("GUI", "HistogramHeight"); } - + if (keyFile.has_key ("GUI", "HistogramDrawMode")) { histogramDrawMode = keyFile.get_integer ("GUI", "HistogramDrawMode"); } @@ -1507,7 +1507,7 @@ void Options::readFromFile(Glib::ustring fname) if (rtSettings.ACESp0 == "RTv4_ACES-AP0") { rtSettings.ACESp0 = "RTv2_ACES-AP0"; } - + } if (keyFile.has_key("Color Management", "ACES-AP1")) { @@ -1515,7 +1515,7 @@ void Options::readFromFile(Glib::ustring fname) if (rtSettings.ACESp1 == "RTv4_ACES-AP1") { rtSettings.ACESp1 = "RTv2_ACES-AP1"; } - + } if (keyFile.has_key("Color Management", "GamutLch")) { @@ -1593,6 +1593,7 @@ void Options::readFromFile(Glib::ustring fname) if (keyFile.has_group("Batch Processing")) { if (keyFile.has_key("Batch Processing", "AdjusterBehavior")) { baBehav = keyFile.get_integer_list("Batch Processing", "AdjusterBehavior"); + baBehav.resize(ADDSET_PARAM_NUM); } }