From 9096ceffde556d60419257a3a584bbd52f74aad2 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 30 May 2015 01:06:25 +0200 Subject: [PATCH] modules: honor GimpColorConfig.display_profile_from_gdk again I broke this during some recent refactoring. --- modules/display-filter-lcms.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/display-filter-lcms.c b/modules/display-filter-lcms.c index 8fc7c19055..db3e319dc6 100644 --- a/modules/display-filter-lcms.c +++ b/modules/display-filter-lcms.c @@ -289,8 +289,8 @@ cdisplay_lcms_get_display_profile (CdisplayLcms *lcms) { GimpColorConfig *config; GimpColorManaged *managed; - GtkWidget *widget = NULL; - GimpColorProfile profile; + GtkWidget *widget = NULL; + GimpColorProfile profile = NULL; config = gimp_color_display_get_config (GIMP_COLOR_DISPLAY (lcms)); managed = gimp_color_display_get_managed (GIMP_COLOR_DISPLAY (lcms)); @@ -298,7 +298,8 @@ cdisplay_lcms_get_display_profile (CdisplayLcms *lcms) if (GTK_IS_WIDGET (managed)) widget = gtk_widget_get_toplevel (GTK_WIDGET (managed)); - profile = gimp_widget_get_color_profile (widget); + if (config->display_profile_from_gdk) + profile = gimp_widget_get_color_profile (widget); if (! profile) profile = gimp_color_config_get_display_profile (config, NULL);