nil check in wrong place

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 10 insertions, 5 deletions

diff --git a/init.go b/init.go
index 9212f00..ac5fb09 100644
--- a/init.go
+++ b/init.go
@@ -14,11 +14,6 @@ var muAction sync.Mutex
 // TODO: add checks for nil function pointers
 func (me *TreeInfo) newAction(a widget.Action) {
 	n := me.treeRoot.FindWidgetId(a.WidgetId)
-	if n == nil {
-		log.Log(TREEWARN, "tree.FindWidgetId() n == nil", a.WidgetId, a.WidgetType, a.ActionType)
-		log.Log(TREEWARN, "tree.FindWidgetId() n == nil", a.State.CurrentS)
-		log.Log(TREEWARN, "tree.FindWidgetId() n == nil. This should not happen. Bug in gui or tree package?")
-	}
 	switch a.ActionType {
 	case widget.Add:
 		if n == nil {
@@ -26,6 +21,16 @@ func (me *TreeInfo) newAction(a widget.Action) {
 			me.Add(n)
 			return
 		}
+		log.Log(TREEWARN, "attempting to re-add widget", a.WidgetId, a.WidgetType, a.ActionType)
+		return
+	}
+	if n == nil {
+		log.Log(TREEWARN, "tree.FindWidgetId() n == nil", a.WidgetId, a.WidgetType, a.ActionType)
+		log.Log(TREEWARN, "tree.FindWidgetId() n == nil", a.State.CurrentS)
+		log.Log(TREEWARN, "tree.FindWidgetId() n == nil. This should not happen. Bug in gui or tree package?")
+		// return
+	}
+	switch a.ActionType {
 	case widget.SetText:
 		log.Log(TREE, "tree.SetText() a.State.CurrentS =", a.State.CurrentS)
 		log.Log(TREE, "tree.SetText() a.State.DefaultS =", a.State.DefaultS)