From 3df7523bfb7f701c5a76f4e356246a08104aa25b Mon Sep 17 00:00:00 2001
From: ffsup2 <ffsup2@localhost>
Date: Sun, 31 Oct 2010 23:48:09 +0100
Subject: [PATCH] Fix for highlight recovery Fix for crash in raw tab

---
 rtengine/rawimagesource.cc | 2 +-
 rtgui/rawprocess.cc        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 67dba0427..d07d9ffc5 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -829,7 +829,7 @@ skip_block: ;
 		if (dmax < pre_mul[c])
 			dmax = pre_mul[c];
 	}
-	dmax = dmin;
+
 	for (c = 0; c < 4; c++)
 		scale_mul[c] = (pre_mul[c] /= dmax) * 65535.0 / sat;
 	if (settings->verbose) {
diff --git a/rtgui/rawprocess.cc b/rtgui/rawprocess.cc
index 8ef48e259..6f526947e 100644
--- a/rtgui/rawprocess.cc
+++ b/rtgui/rawprocess.cc
@@ -107,8 +107,9 @@ void RawProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedi
 	pp->raw.dcb_iterations = (int)dcbIterations->getValue();
 	pp->raw.dcb_enhance = dcbEnhance->get_active();
 
-	if( dmethod->get_active_row_number() < procparams::RAWParams::numMethods)
-		pp->raw.dmethod = procparams::RAWParams::methodstring[dmethod->get_active_row_number()];
+	int currentRow = dmethod->get_active_row_number();
+	if( currentRow>=0 && currentRow < procparams::RAWParams::numMethods)
+		pp->raw.dmethod = procparams::RAWParams::methodstring[currentRow];
 
 	if (pedited) {
 		pedited->raw.ccSteps = ccSteps->getEditedState ();