Author: akv
Date: 2010-02-15 21:25:09 +0100 (Mon, 15 Feb 2010)
New Revision: 3236

Modified:
   trunk/src/rs-photo.c
Log:
Only update WB if photo->input exists and only do it for current snapshot.

Modified: trunk/src/rs-photo.c
===================================================================
--- trunk/src/rs-photo.c        2010-02-15 19:01:04 UTC (rev 3235)
+++ trunk/src/rs-photo.c        2010-02-15 20:25:09 UTC (rev 3236)
@@ -327,18 +327,13 @@
        rs_settings_copy(settings, mask, photo->settings[snapshot]);
 
         /* Check if we need to update WB to camera or auto */
-       gint i;
-       for(i = 0; i < 3; i++)
+       if (mask & MASK_WB && photo->input && 
photo->settings[snapshot]->wb_ascii)
        {
-               if (mask & MASK_WB && photo->settings[i]->wb_ascii)
-               {
-                       if (g_strcmp0(photo->settings[i]->wb_ascii, 
PRESET_WB_AUTO) == 0)
-                               rs_photo_set_wb_auto(photo, i);
-                       else if (g_strcmp0(photo->settings[i]->wb_ascii, 
PRESET_WB_CAMERA) == 0)
-                               rs_photo_set_wb_from_camera(photo, i);
-               }
+               if (g_strcmp0(photo->settings[snapshot]->wb_ascii, 
PRESET_WB_AUTO) == 0)
+                       rs_photo_set_wb_auto(photo, snapshot);
+               else if (g_strcmp0(photo->settings[snapshot]->wb_ascii, 
PRESET_WB_CAMERA) == 0)
+                       rs_photo_set_wb_from_camera(photo, snapshot);
        }
-
 }
 
 /**


_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit

Reply via email to