core/internalcmd: fix crash launching internal cmd async.

jmigpin · Feb 22, 2024 · 642e813 · 642e813
1 parent 462c002
commit 642e813
Showing 1 changed file with 20 additions and 19 deletions.
diff --git a/core/internalcmd.go b/core/internalcmd.go
@@ -139,35 +139,36 @@ func internalCmdFromRowTbFirstPart(erow *ERow, part *toolbarparser.Part) bool {
 
 // erow can be nil (ex: a root toolbar cmd)
 func internalExternalCmd(ed *Editor, part *toolbarparser.Part, optERow *ERow) {
-	// run with busy cursor
-	node := ed.UI.RootNode
-	if optERow != nil {
-		node = optERow.Row
+
+	// TODO: remove sync dependency or it will crash
+	// TODO: also, need active row check here instead of internalcmd2
+	//// run with busy cursor
+	//node := ed.UI.RootNode
+	//if optERow != nil {
+	//	node = optERow.Row
+	//}
+	//ed.RunAsyncBusyCursor(node, func() {
+
+	if err := internalCmd2(ed, part, optERow); err != nil {
+		arg0 := part.Args[0].UnquotedString()
+		ed.Errorf("%s: %w", arg0, err)
 	}
-	ed.RunAsyncBusyCursor(node, func() {
 
-		if err := internalCmd2(ed, part, optERow); err != nil {
-			arg0 := part.Args[0].UnquotedString()
-			ed.Errorf("%s: %w", arg0, err)
-		}
-	})
+	//})
 }
+
 func internalCmd2(ed *Editor, part *toolbarparser.Part, optERow *ERow) error {
 	if optERow == nil {
 		if ae, ok := ed.ActiveERow(); ok {
 			optERow = ae
 		}
 	}
 
-	if handled, err := internalCmd3(ed, part, optERow); err != nil {
+	if err, handled := internalCmd3(ed, part, optERow); handled {
 		return err
-	} else if handled {
-		return nil
 	}
 
-	// have a plugin handle the cmd
-	handled := ed.Plugins.RunToolbarCmd(optERow, part)
-	if handled {
+	if handled := ed.Plugins.RunToolbarCmd(optERow, part); handled {
 		return nil
 	}
 
@@ -179,11 +180,11 @@ func internalCmd2(ed *Editor, part *toolbarparser.Part, optERow *ERow) error {
 	ExternalCmd(erow, part)
 	return nil
 }
-func internalCmd3(ed *Editor, part *toolbarparser.Part, optERow *ERow) (bool, error) {
+func internalCmd3(ed *Editor, part *toolbarparser.Part, optERow *ERow) (error, bool) {
 	arg0 := part.Args[0].UnquotedString()
 	cmd, ok := InternalCmds[arg0]
 	if !ok {
-		return false, nil
+		return nil, false
 	}
 	ctx := context.Background()
 	args := &InternalCmdArgs{cmd, ctx, ed, part, optERow}
@@ -192,7 +193,7 @@ func internalCmd3(ed *Editor, part *toolbarparser.Part, optERow *ERow) (bool, er
 		defer cancel()
 		args.Ctx = ctx2
 	}
-	return true, cmd.Fn(args)
+	return cmd.Fn(args), true
 }
 
 //----------