From ad3796f5a8f3f0c46b7bd5c62af8865c4f735156 Mon Sep 17 00:00:00 2001
From: Sean Smith <seandanielsmith@gmail.com>
Date: Thu, 4 Jul 2019 11:12:20 -0400
Subject: [PATCH] Fix cryptolive widget

Addresses #481
Inverts the item list return, to make sure we always trigger wg.Done and not hang the widget
Clean up config for toplist widget, as we were assigning to `currencies` rather than `top` erroneously
---
 .../cryptolive/price/widget.go                | 17 ++++++--------
 .../cryptolive/toplist/settings.go            | 23 ++++---------------
 .../cryptolive/toplist/widget.go              | 11 ++++-----
 3 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/modules/cryptoexchanges/cryptolive/price/widget.go b/modules/cryptoexchanges/cryptolive/price/widget.go
index faada9c1..10297672 100644
--- a/modules/cryptoexchanges/cryptolive/price/widget.go
+++ b/modules/cryptoexchanges/cryptolive/price/widget.go
@@ -45,17 +45,14 @@ func (widget *Widget) setList() {
 
 // Refresh & update after interval time
 func (widget *Widget) Refresh(wg *sync.WaitGroup) {
-	if len(widget.list.items) == 0 {
-		return
+	if len(widget.list.items) != 0 {
+		widget.updateCurrencies()
+		if !ok {
+			widget.Result = fmt.Sprint("Please check your internet connection!")
+		} else {
+			widget.display()
+		}
 	}
-
-	widget.updateCurrencies()
-
-	if !ok {
-		widget.Result = fmt.Sprint("Please check your internet connection!")
-		return
-	}
-	widget.display()
 	wg.Done()
 }
 
diff --git a/modules/cryptoexchanges/cryptolive/toplist/settings.go b/modules/cryptoexchanges/cryptolive/toplist/settings.go
index c49ecba1..4d61c24a 100644
--- a/modules/cryptoexchanges/cryptolive/toplist/settings.go
+++ b/modules/cryptoexchanges/cryptolive/toplist/settings.go
@@ -37,9 +37,8 @@ type currency struct {
 
 type Settings struct {
 	colors
-	common     *cfg.Common
-	currencies map[string]*currency
-	top        map[string]*currency
+	common *cfg.Common
+	top    map[string]*currency
 }
 
 func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
@@ -61,21 +60,7 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co
 	settings.colors.top.to.field = ymlConfig.UString("colors.top.to.field")
 	settings.colors.top.to.value = ymlConfig.UString("colors.top.to.value")
 
-	settings.currencies = make(map[string]*currency)
-
-	for key, val := range ymlConfig.UMap("currencies") {
-		coercedVal := val.(map[string]interface{})
-
-		limit, _ := coercedVal["limit"].(int)
-
-		currency := &currency{
-			displayName: coercedVal["displayName"].(string),
-			limit:       limit,
-			to:          coercedVal["to"].([]interface{}),
-		}
-
-		settings.currencies[key] = currency
-	}
+	settings.top = make(map[string]*currency)
 
 	for key, val := range ymlConfig.UMap("top") {
 		coercedVal := val.(map[string]interface{})
@@ -88,7 +73,7 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co
 			to:          coercedVal["to"].([]interface{}),
 		}
 
-		settings.currencies[key] = currency
+		settings.top[key] = currency
 	}
 
 	return &settings
diff --git a/modules/cryptoexchanges/cryptolive/toplist/widget.go b/modules/cryptoexchanges/cryptolive/toplist/widget.go
index 58eafd3f..532abbed 100644
--- a/modules/cryptoexchanges/cryptolive/toplist/widget.go
+++ b/modules/cryptoexchanges/cryptolive/toplist/widget.go
@@ -55,13 +55,12 @@ func (widget *Widget) makeToList(symbol string, limit int) (list []*tCurrency) {
 
 // Refresh & update after interval time
 func (widget *Widget) Refresh(wg *sync.WaitGroup) {
-	if len(widget.list.items) == 0 {
-		return
+	if len(widget.list.items) != 0 {
+
+		widget.updateData()
+
+		widget.display()
 	}
-
-	widget.updateData()
-
-	widget.display()
 	wg.Done()
 }