From be3fde6d02ac45877b67d752ea383cf44c8d7d3d Mon Sep 17 00:00:00 2001
From: X512 <danger_mail@list.ru>
Date: Thu, 19 Nov 2020 14:44:15 +0900
Subject: [PATCH] app_server: perform NULL check before use
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #16610.

Change-Id: Ic377a2faef7279f607298b3b80bc44bc1c6aae36
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3401
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
Reviewed-by: Axel Dörfler <axeld@pinc-software.de>
---
 src/servers/app/Desktop.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 721703ef93..3402caaf94 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -514,15 +514,15 @@ Desktop::Init()
 	fVirtualScreen.SetConfiguration(*this,
 		fWorkspaces[0].CurrentScreenConfiguration());
 
-	float brightness = fWorkspaces[0].StoredScreenConfiguration().Brightness(0);
-	if (brightness > 0)
-		HWInterface()->SetBrightness(brightness);
-
 	if (fVirtualScreen.HWInterface() == NULL) {
 		debug_printf("Could not initialize graphics output. Exiting.\n");
 		return B_ERROR;
 	}
 
+	float brightness = fWorkspaces[0].StoredScreenConfiguration().Brightness(0);
+	if (brightness > 0)
+		HWInterface()->SetBrightness(brightness);
+
 	fVirtualScreen.HWInterface()->MoveCursorTo(
 		fVirtualScreen.Frame().Width() / 2,
 		fVirtualScreen.Frame().Height() / 2);