From cd6b11222c59d256bb21c7a48b2e54d3d4141d86 Mon Sep 17 00:00:00 2001
From: Paulb23 <p_batty@hotmail.co.uk>
Date: Wed, 1 Sep 2021 16:44:47 +0100
Subject: [PATCH] Prevent crash on startup if no audio server

---
 scene/main/viewport.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 8ec8c193fb1..e69f8cd9f7e 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -822,7 +822,9 @@ Rect2 Viewport::get_visible_rect() const {
 }
 
 void Viewport::_update_listener_2d() {
-	AudioServer::get_singleton()->notify_listener_changed();
+	if (AudioServer::get_singleton()) {
+		AudioServer::get_singleton()->notify_listener_changed();
+	}
 }
 
 void Viewport::set_as_audio_listener_2d(bool p_enable) {
@@ -3075,7 +3077,9 @@ bool Viewport::is_audio_listener_3d() const {
 }
 
 void Viewport::_update_listener_3d() {
-	AudioServer::get_singleton()->notify_listener_changed();
+	if (AudioServer::get_singleton()) {
+		AudioServer::get_singleton()->notify_listener_changed();
+	}
 }
 
 void Viewport::_listener_transform_3d_changed_notify() {