From 08b67de9bf6e338334d9cf93c6b2ae061d3ec9be Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 3 May 2016 23:57:04 +0200 Subject: [PATCH] app: don't disable profile import when display color management is off It's the wrong switch, and the dialog has its own "don't ask me again" logic. --- app/core/gimpimage-color-profile.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/core/gimpimage-color-profile.c b/app/core/gimpimage-color-profile.c index d99cecd084..bb505e5e5a 100644 --- a/app/core/gimpimage-color-profile.c +++ b/app/core/gimpimage-color-profile.c @@ -403,17 +403,10 @@ gimp_image_import_color_profile (GimpImage *image, GimpProgress *progress, gboolean interactive) { - GimpColorConfig *config; - g_return_if_fail (GIMP_IS_IMAGE (image)); g_return_if_fail (GIMP_IS_CONTEXT (context)); g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress)); - config = image->gimp->config->color_management; - - if (config->mode == GIMP_COLOR_MANAGEMENT_OFF) - return; - if (gimp_image_get_color_profile (image)) { GimpColorProfilePolicy policy; @@ -445,8 +438,11 @@ gimp_image_import_color_profile (GimpImage *image, if (policy == GIMP_COLOR_PROFILE_POLICY_CONVERT) { - GimpColorRenderingIntent intent; - gboolean bpc; + GimpColorConfig *config; + GimpColorRenderingIntent intent; + gboolean bpc; + + config = image->gimp->config->color_management; if (! dest_profile) {