From 8f5e1054fb3c3e89e1557ef63f9992bba71996bd Mon Sep 17 00:00:00 2001
From: mappu <mappu04@gmail.com>
Date: Sun, 14 Jul 2024 15:28:18 +1200
Subject: [PATCH] db: return error from contextAction.Callback (2)

---
 db_bolt.go        | 4 ++--
 loadedDatabase.go | 2 +-
 main.go           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/db_bolt.go b/db_bolt.go
index ee67ad0..2adc294 100644
--- a/db_bolt.go
+++ b/db_bolt.go
@@ -151,7 +151,7 @@ func (ld *boltLoadedDatabase) NavContext(ndata *navData) (ret []contextAction, e
 	return
 }
 
-func (ld *boltLoadedDatabase) AddChildBucket(ndata *navData) error {
+func (ld *boltLoadedDatabase) AddChildBucket(sender vcl.IComponent, ndata *navData) error {
 	bucketName := ""
 	if !vcl.InputQuery(APPNAME, "Enter a name for the new bucket:", &bucketName) {
 		return nil // cancel
@@ -174,7 +174,7 @@ func (ld *boltLoadedDatabase) AddChildBucket(ndata *navData) error {
 	return nil
 }
 
-func (ld *boltLoadedDatabase) DeleteBucket(ndata *navData) error {
+func (ld *boltLoadedDatabase) DeleteBucket(sender vcl.IComponent, ndata *navData) error {
 	err := ld.db.Update(func(tx *bbolt.Tx) error {
 		// Find parent of this bucket.
 		if len(ndata.bucketPath) >= 2 {
diff --git a/loadedDatabase.go b/loadedDatabase.go
index 21fcb7d..384db63 100644
--- a/loadedDatabase.go
+++ b/loadedDatabase.go
@@ -11,7 +11,7 @@ var ErrNotSupported error = errors.New("Unsupported action for this database typ
 
 type contextAction struct {
 	Name     string
-	Callback func(ndata *navData) error
+	Callback func(sender vcl.IComponent, ndata *navData) error
 }
 
 // loadedDatabase is a DB-agnostic interface for each loaded database.
diff --git a/main.go b/main.go
index 32f986a..d49117e 100644
--- a/main.go
+++ b/main.go
@@ -507,7 +507,7 @@ func (f *TMainForm) OnNavContextPopup(sender vcl.IObject, mousePos types.TPoint,
 			mnuAction.SetCaption(action.Name)
 			cb := action.Callback // Copy to avoid reuse of loop variable
 			mnuAction.SetOnClick(func(sender vcl.IObject) {
-				err = cb(ndata)
+				err = cb(f, ndata)
 				if err != nil {
 					vcl.ShowMessage(err.Error())
 				}