some fixes for darktable-org#6836

elstoc · Nov 12, 2020 · a35e2c9 · a35e2c9
1 parent 8ed3510
commit a35e2c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/develop/imageop.c b/src/develop/imageop.c
@@ -1162,8 +1162,6 @@ static void dt_iop_gui_off_callback(GtkToggleButton *togglebutton, gpointer user
 
       if(dt_conf_get_bool("darkroom/ui/activate_expand") && !module->expanded)
         dt_iop_gui_set_expanded(module, TRUE, dt_conf_get_bool("darkroom/ui/single_module"));
-
-      module->gui_update(module);
     }
     else
     {
@@ -1294,16 +1292,13 @@ void dt_iop_gui_update_header(dt_iop_module_t *module)
 
 void dt_iop_set_module_in_trouble(dt_iop_module_t *module, const gboolean state)
 {
-  gboolean previous_state = module->has_trouble;
-
   // we don't set disabled modules in trouble, that would be annoying
   if(module->enabled)
     module->has_trouble = state;
   else
     module->has_trouble = FALSE;
 
-  if(module->has_trouble != previous_state)
-    _iop_gui_update_header(module);
+  _iop_gui_update_header(module);
 }
 
 static void _iop_gui_update_label(dt_iop_module_t *module)

diff --git a/src/iop/channelmixerrgb.c b/src/iop/channelmixerrgb.c
@@ -1032,7 +1032,10 @@ static void _develop_ui_pipe_finished_callback(gpointer instance, gpointer user_
 
   if(g == NULL) return;
   if(p->illuminant != DT_ILLUMINANT_DETECT_EDGES && p->illuminant != DT_ILLUMINANT_DETECT_SURFACES)
+  {
+    gui_changed(self, NULL, NULL);
     return;
+  }
 
   dt_pthread_mutex_lock(&g->lock);
   p->x = g->XYZ[0];
@@ -1741,6 +1744,7 @@ void cleanup_pipe(struct dt_iop_module_t *self, dt_dev_pixelpipe_t *pipe, dt_dev
 void gui_reset(dt_iop_module_t *self)
 {
   dt_iop_color_picker_reset(self, TRUE);
+  gui_changed(self, NULL, NULL);
 }
 
 static int calculate_bogus_daylight_wb(dt_iop_module_t *module, double bwb[4])
@@ -1982,7 +1986,7 @@ void gui_changed(dt_iop_module_t *self, GtkWidget *w, void *previous)
     dt_iop_order_entry_t *current_instance
         = dt_ioppr_get_iop_order_entry(self->dev->iop_order_list, "channelmixerrgb", self->multi_priority);
 
-    if(CAT_instance != current_instance)
+    if(CAT_instance && CAT_instance->o.iop_order != current_instance->o.iop_order)
     {
       // our second biggest problem : another channelmixerrgb instance is doing CAT earlier in the pipe
       dt_iop_set_module_in_trouble(self, TRUE);

diff --git a/src/libs/history.c b/src/libs/history.c
@@ -1122,6 +1122,7 @@ static void _lib_history_truncate(gboolean compress)
   sqlite3_step(stmt);
   sqlite3_finalize(stmt);
 
+  darktable.develop->proxy.chroma_adaptation = NULL;
   dt_dev_reload_history_items(darktable.develop);
   DT_DEBUG_CONTROL_SIGNAL_RAISE(darktable.signals, DT_SIGNAL_DEVELOP_HISTORY_CHANGE);
   dt_dev_modulegroups_set(darktable.develop, dt_dev_modulegroups_get(darktable.develop));