X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcompositor.c;fp=src%2Fcompositor.c;h=59c3d9f488f875d896d41f96d4f6aada024a0a3f;hb=71f98b4252498f48b64f12d069d18f5a490658cf;hp=305260d86bfe58076c7b5718c0972fe99ff03bf2;hpb=780661c62c1a363d355fd47cb9ad278962174ee3;p=src%2Fagl-compositor.git

diff --git a/src/compositor.c b/src/compositor.c
index 305260d..59c3d9f 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012-2021 Collabora, Ltd.
+ * Copyright © 2012-2024 Collabora, Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -327,15 +327,15 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
 	output->name = name;
 	output->config = config;
 
-	if (ivi->simple_output_configure) {
-		output->output =
-			weston_compositor_create_output(ivi->compositor, head, head->name);
-		if (!output->output) {
-			free(output->name);
-			free(output);
-			return NULL;
-		}
+	output->output =
+		weston_compositor_create_output(ivi->compositor, head, head->name);
+	if (!output->output) {
+		free(output->name);
+		free(output);
+		return NULL;
+	}
 
+	if (ivi->simple_output_configure) {
 		int ret = ivi->simple_output_configure(output->output);
 		if (ret < 0) {
 			weston_log("Configuring output \"%s\" failed.\n",
@@ -352,15 +352,6 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
 			ivi->init_failed = true;
 			return NULL;
 		}
-
-	} else {
-		output->output =
-			weston_compositor_create_output(ivi->compositor, head, name);
-		if (!output->output) {
-			free(output->name);
-			free(output);
-			return NULL;
-		}
 	}
 
 	output->output_destroy.notify = handle_output_destroy;