allow skipping the asyncWork definition

Author: markusressel

internal/ui/dialog/file_history_overlay.go

@@ -804,29 +804,23 @@ func (o *FileHistoryOverlay) restoreSelectedVersion() {
 		DiffState:     entry.DiffState,
 	}
 
-	// 1. Dummy handler to trigger the async sequence
-	asyncWork := func(d *SelectionDialog, action DialogActionId) error {
-		return nil
-	}
-
 	onComplete := func(d *SelectionDialog, option *DialogOption, err error) {
-		d.Close()
-
+		// Only trigger chain logic if we are doing a restore
 		if option.Id == RestoreFileDialogRestoreFileActionId || option.Id == RestoreFileDialogRestoreRecursiveActionId {
 
-			// FIX: Forcefully drop the focus back to the persistent table layout *before* // mounting the next dialog. This guarantees the Progress Dialog will record
-			// the table as its fallback focus instead of the dying Selection Dialog.
-			o.application.SetFocus(o.tableContainer.GetLayout())
-
-			// Mount directly (We are already safely inside the main UI thread)
-			progressDialog := NewRestoreFileProgressDialog(o.application, restoreEntry, false)
-			ShowDialogOnPages(o.application, o.pages, progressDialog, func() {
-				o.updateDiff()
+			// Use Chain() instead of Close() + QueueUpdateDraw()
+			d.Chain(func() {
+				progressDialog := NewRestoreFileProgressDialog(o.application, restoreEntry, false)
+				ShowDialogOnPages(o.application, o.pages, progressDialog, func() {
+					o.updateDiff()
+				})
 			})
+		} else {
+			d.Close()
 		}
 	}
 
-	restoreDialog := NewRestoreFileDialog(o.application, restoreEntry, asyncWork, onComplete)
+	restoreDialog := NewRestoreFileDialog(o.application, restoreEntry, nil, onComplete)
 	ShowDialogOnPages(o.application, o.pages, restoreDialog, nil)
 }
 

internal/ui/dialog/selection_dialog.go

@@ -25,6 +25,7 @@ type SelectionDialog struct {
 	onComplete func(d *SelectionDialog, option *DialogOption, err error)
 }
 
+// NewSelectionDialog
 // handler - The background execution logic to be executed when the user selects an option.
 // onComplete - The callback to be executed on the UI thread after the background execution completes.
 func NewSelectionDialog(
@@ -120,7 +121,25 @@ func (d *SelectionDialog) GetActionChannel() <-chan DialogActionId {
 }
 
 func (d *SelectionDialog) Close() {
-	emitDialogActions(d.actionChannel, DialogCloseActionId)
+	// Bypass emitDialogActions' goroutine to guarantee the close signal
+	// is processed synchronously if the listener is ready.
+	select {
+	case d.actionChannel <- DialogCloseActionId:
+	default:
+		go func() { d.actionChannel <- DialogCloseActionId }()
+	}
+}
+
+// Chain safely orchestrates closing the current dialog and opening a new one.
+// It prevents the "Dead Focus Pointer" bug by guaranteeing the current dialog
+// fully unmounts and restores its focus before the next dialog captures its fallback.
+func (d *SelectionDialog) Chain(mountNext func()) {
+	d.Close()
+	go func() {
+		// A microscopic pause gives the background listener time to process the close event
+		time.Sleep(10 * time.Millisecond)
+		d.application.QueueUpdateDraw(mountNext)
+	}()
 }
 
 func (d *SelectionDialog) selectAction(option *DialogOption) {
@@ -129,18 +148,18 @@ func (d *SelectionDialog) selectAction(option *DialogOption) {
 		return
 	}
 
-	// 1. Always show loading, even if the work is instantaneous
+	// 1. Always trigger the loading state and background routine
 	d.ShowLoading(option)
 
 	go func() {
 		var err error
 
-		// 2. Only execute the handler if one was actually provided
+		// 2. Safely execute the handler only if it was provided
 		if d.handler != nil {
 			err = d.handler(d, option.Id)
 		}
 
-		// 3. Always queue the completion logic back onto the main UI thread
+		// 3. Queue the completion logic back to the main UI thread
 		d.application.QueueUpdateDraw(func() {
 			d.StopLoading()
 			if d.onComplete != nil {