1 files changed, 7 insertions, 3 deletions

diff --git a/sway/commands/output.c b/sway/commands/output.c
index c102344d..5e5d31b3 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -27,6 +27,7 @@ static const struct cmd_handler output_handlers[] = {
         { "subpixel", output_cmd_subpixel },
         { "toggle", output_cmd_toggle },
         { "transform", output_cmd_transform },
+        { "unplug", output_cmd_unplug },
 };
 
 struct cmd_results *cmd_output(int argc, char **argv) {
@@ -102,15 +103,18 @@ struct cmd_results *cmd_output(int argc, char **argv) {
 
         bool background = output->background;
 
-        output = store_output_config(output);
+        store_output_config(output);
 
         // If reloading, the output configs will be applied after reading the
         // entire config and before the deferred commands so that an auto generated
         // workspace name is not given to re-enabled outputs.
         if (!config->reloading && !config->validating) {
-                apply_output_config_to_outputs(output);
+                apply_all_output_configs();
                 if (background) {
-                        spawn_swaybg();
+                        if (!spawn_swaybg()) {
+                                return cmd_results_new(CMD_FAILURE,
+                                        "Failed to apply background configuration");
+                        }
                 }
         }