From 530fbcc1298bd65329bdb5d2d8f84aef8122f30f Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 19 Jan 2024 12:08:21 -0600 Subject: cleaner names Signed-off-by: Jeff Carr --- init.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'init.go') 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) } -- cgit v1.2.3