From 8023c2d51c2f0b6f94ab97cfecee669f59894c46 Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Thu, 21 Apr 2022 17:59:42 +0200
Subject: [PATCH] Removed merge icon handling on pages that don't use them

---
 maloja/web/jinja/abstracts/base.jinja | 4 +---
 maloja/web/jinja/artist.jinja         | 1 +
 maloja/web/jinja/track.jinja          | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/maloja/web/jinja/abstracts/base.jinja b/maloja/web/jinja/abstracts/base.jinja
index b88b902..f0ff337 100644
--- a/maloja/web/jinja/abstracts/base.jinja
+++ b/maloja/web/jinja/abstracts/base.jinja
@@ -86,9 +86,7 @@
 			{% block icon_bar %}{% endblock %}
 			{% include 'icons/settings.jinja' %}
 		</div>
-		<script>
-			showValidMergeIcons();
-		</script>
+		
 
 		<div id="notification_area">
 
diff --git a/maloja/web/jinja/artist.jinja b/maloja/web/jinja/artist.jinja
index d8f4fbc..eb09c77 100644
--- a/maloja/web/jinja/artist.jinja
+++ b/maloja/web/jinja/artist.jinja
@@ -33,6 +33,7 @@
 		{% include 'icons/merge.jinja' %}
 		{% include 'icons/merge_mark.jinja' %}
 		{% include 'icons/merge_cancel.jinja' %}
+		<script>showValidMergeIcons();</script>
 	{% endif %}
 {% endblock %}
 
diff --git a/maloja/web/jinja/track.jinja b/maloja/web/jinja/track.jinja
index 561dc68..291add0 100644
--- a/maloja/web/jinja/track.jinja
+++ b/maloja/web/jinja/track.jinja
@@ -28,6 +28,7 @@
 		{% include 'icons/merge.jinja' %}
 		{% include 'icons/merge_mark.jinja' %}
 		{% include 'icons/merge_cancel.jinja' %}
+		<script>showValidMergeIcons();</script>
 	{% endif %}
 {% endblock %}