From 7f6e5bc8602497e17be629a993fbc3c2beb0d5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:55:05 +0200
Subject: [PATCH] action/command: On `reload` check and inform about errors

---
 internal/action/command.go | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/internal/action/command.go b/internal/action/command.go
index 81d2467b..7167336f 100644
--- a/internal/action/command.go
+++ b/internal/action/command.go
@@ -362,9 +362,12 @@ func reloadRuntime(reloadPlugins bool) {
 		defaultSettings := config.DefaultAllSettings()
 		for k := range defaultSettings {
 			if _, ok := parsedSettings[k]; ok {
-				SetGlobalOptionNative(k, parsedSettings[k])
+				err = SetGlobalOptionNative(k, parsedSettings[k])
 			} else {
-				SetGlobalOptionNative(k, defaultSettings[k])
+				err = SetGlobalOptionNative(k, defaultSettings[k])
+			}
+			if err != nil {
+				screen.TermMessage(err)
 			}
 		}
 	}
@@ -526,8 +529,7 @@ func SetGlobalOptionNative(option string, nativeValue interface{}) error {
 	// check for local option first...
 	for _, s := range config.LocalSettings {
 		if s == option {
-			MainTab().CurPane().Buf.SetOptionNative(option, nativeValue)
-			return nil
+			return MainTab().CurPane().Buf.SetOptionNative(option, nativeValue)
 		}
 	}
 
@@ -585,7 +587,9 @@ func SetGlobalOptionNative(option string, nativeValue interface{}) error {
 	}
 
 	for _, b := range buffer.OpenBuffers {
-		b.SetOptionNative(option, nativeValue)
+		if err := b.SetOptionNative(option, nativeValue); err != nil {
+			return err
+		}
 	}
 
 	return config.WriteSettings(filepath.Join(config.ConfigDir, "settings.json"))