cleaner namesv0.0.5

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

1 files changed, 6 insertions, 10 deletions

diff --git a/init.go b/init.go
index 9c6ef5d..ba82b78 100644
--- a/init.go
+++ b/init.go
@@ -10,19 +10,11 @@ import (
 
 var muAction sync.Mutex
 
-func (me *TreeInfo) toolkit(a widget.Action) {
-	if me.ActionFromChannel == nil {
-		log.Error(errors.New("toolkit ActionFromChannel == nil"), a.WidgetId, a.ActionType, a.WidgetType)
-		return
-	}
-	me.ActionFromChannel(a)
-}
-
 func (me *TreeInfo) catchActionChannel() {
 	defer func() {
 		if r := recover(); r != nil {
 			log.Warn(me.PluginName, "tree YAHOOOO Recovered in simpleStdin()", r)
-			me.DoToolkitPanic()
+			me.SendToolkitPanic()
 			panic(-1)
 		}
 	}()
@@ -43,7 +35,11 @@ func (me *TreeInfo) catchActionChannel() {
 			*/
 			muAction.Lock()
 			// send this to the toolkit
-			me.toolkit(a)
+			if me.ActionFromChannel == nil {
+				log.Error(errors.New("toolkit ActionFromChannel == nil"), a.WidgetId, a.ActionType, a.WidgetType)
+			} else {
+				me.ActionFromChannel(a)
+			}
 			muAction.Unlock()
 			// log.Info("catchActionChannel() STUFF END", a.WidgetId, a.ActionType, a.WidgetType)
 		}