1 files changed, 6 insertions, 3 deletions

diff --git a/sway/config/output.c b/sway/config/output.c
index 3316085a..3c1822d8 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -825,7 +825,9 @@ static bool _spawn_swaybg(char **command) {
                         setenv("WAYLAND_SOCKET", wayland_socket_str, true);
 
                         execvp(command[0], command);
-                        sway_log_errno(SWAY_ERROR, "execvp failed");
+                        sway_log_errno(SWAY_ERROR, "failed to execute '%s' "
+                                "(background configuration probably not applied)",
+                                command[0]);
                         _exit(EXIT_FAILURE);
                 }
                 _exit(EXIT_SUCCESS);
@@ -835,12 +837,13 @@ static bool _spawn_swaybg(char **command) {
                 sway_log_errno(SWAY_ERROR, "close failed");
                 return false;
         }
-        if (waitpid(pid, NULL, 0) < 0) {
+        int fork_status = 0;
+        if (waitpid(pid, &fork_status, 0) < 0) {
                 sway_log_errno(SWAY_ERROR, "waitpid failed");
                 return false;
         }
 
-        return true;
+        return WIFEXITED(fork_status) && WEXITSTATUS(fork_status) == EXIT_SUCCESS;
 }
 
 bool spawn_swaybg(void) {