Merge pull request #18172 from esq4/_style_dialogs

Style dialogs
darktable-org · Jan 21, 2025 · 1dd26db · 1dd26db
2 parents 3256732 + f1df844
commit 1dd26db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/common/history.c b/src/common/history.c
@@ -1051,7 +1051,7 @@ GList *dt_history_get_items(const dt_imgid_t imgid,
      " FROM main.history"
      " WHERE imgid=?1"
      "   AND enabled in (1, ?2)"
-     " GROUP BY num, operation, multi_priority"
+     " GROUP BY operation || multi_name, multi_priority"
      " ORDER BY %s DESC, %s DESC",
      multi_priority_order ? "multi_priority" : "num",
      multi_priority_order ? "num" : "multi_priority");

diff --git a/src/common/styles.c b/src/common/styles.c
@@ -1101,9 +1101,9 @@ GList *dt_styles_get_item_list(const char *name,
           "        multi_name, FALSE, blendop_version"
           " FROM main.history"
           " WHERE imgid=?2 AND main.history.enabled=1"
-          "   AND (main.history.operation"
-          "        NOT IN (SELECT operation FROM data.style_items WHERE styleid=?1))"
-          " GROUP BY operation HAVING MAX(num) ORDER BY num DESC", -1, &stmt, NULL);
+          "   AND (main.history.operation || multi_name"
+          "        NOT IN (SELECT operation || multi_name FROM data.style_items WHERE styleid=?1))"
+          " GROUP BY (operation || multi_name) HAVING MAX(num) ORDER BY num DESC", -1, &stmt, NULL);
         // clang-format on
       DT_DEBUG_SQLITE3_BIND_INT(stmt, 2, imgid);
     }