From a4655fce494ff0ab970622dfa9fe30e58b4a32ec Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <mokaddem.sami@gmail.com>
Date: Tue, 21 Nov 2017 11:08:08 +0100
Subject: [PATCH] ui fix: prevent race condition with popover trophy update

---
 static/js/contrib.js | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/static/js/contrib.js b/static/js/contrib.js
index 158e745..baf85d8 100644
--- a/static/js/contrib.js
+++ b/static/js/contrib.js
@@ -527,17 +527,24 @@ function updateProgressHeader(org) {
             categ = trophy_categ_list[i];
             $('#trophy_'+categ).attr('src', source);
             $('#trophy_'+categ).attr('title', "");
-            $('#trophy_'+categ).popover("destroy")
-        }
-        for(var i=0; i<data.length; i++) { // add
-            categ = data[i].categ;
-            rank = data[i].trophy_true_rank;
-            trophy_points = data[i].trophy_points
-            source = url_baseTrophyLogo+rank+'.png'
-            $('#trophy_'+categ).attr('src', source);
-            $('#trophy_'+categ).attr('title', trophy_title[rank]);
-            $('#trophy_'+categ).popover({title: trophy_title[rank], content: 'Level: '+rank+' ('+trophy_points+' points)', trigger: "hover", placement: "bottom"});
+            try { // in case popover not created
+                var pop = $('#trophy_'+categ).data('bs.popover');
+                pop.destroy();
+            } catch(err) {
+
+            }
         }
+        setTimeout(function() { // avoid race condition with destroy
+            for(var i=0; i<data.length; i++) { // add
+                categ = data[i].categ;
+                rank = data[i].trophy_true_rank;
+                trophy_points = data[i].trophy_points
+                source = url_baseTrophyLogo+rank+'.png'
+                $('#trophy_'+categ).attr('src', source);
+                $('#trophy_'+categ).attr('title', trophy_title[rank]);
+                $('#trophy_'+categ).popover({title: trophy_title[rank], content: 'Level: '+rank+' ('+trophy_points+' points)', trigger: "hover", placement: "bottom"});
+            }
+        }, 300);
     });
 
     //update overtake points