# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1241160528 -32400
# Node ID c1e22cba400390e913b75efd3c54bb8ce23831ec
# Parent  cef502852c4ff3a270902d3e3b7b95d63cb93814# Parent  8c018844df9ab2d082ea9ef1d34bec969d104d5c
merged

diff -r cef502852c4f -r c1e22cba4003 src/image.c
--- a/src/image.c	Fri May 01 15:48:11 2009 +0900
+++ b/src/image.c	Fri May 01 15:48:48 2009 +0900
@@ -243,7 +243,7 @@
 		screen_type = COLOR_PROFILE_MEM;
 		DEBUG_1("Using X11 screen profile, length: %d", screen_profile_len);
 		}
-	else if (options->color_profile.screen_file &&
+	if (options->color_profile.screen_file &&
 	    is_readable_file(options->color_profile.screen_file))
 		{
 		screen_type = COLOR_PROFILE_FILE;
@@ -348,10 +348,10 @@
 #if 0
 		if (run_in_bg) color_man_start_bg(imd->cm, image_post_process_color_cb, imd);
 #endif
+		return TRUE;
 		}
 
-	image_update_util(imd);
-	return !!cm;
+	return FALSE;
 }