From 0ea854a9da12ace1161573f319e9cf481f07e8e8 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 2 Jan 2018 14:34:34 +0000
Subject: [PATCH] Don't return android windowing data if we have no window

---
 renderdoccmd/renderdoccmd_android.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/renderdoccmd/renderdoccmd_android.cpp b/renderdoccmd/renderdoccmd_android.cpp
index eaa13a73e..30854a3fe 100644
--- a/renderdoccmd/renderdoccmd_android.cpp
+++ b/renderdoccmd/renderdoccmd_android.cpp
@@ -301,7 +301,12 @@ WindowingData DisplayRemoteServerPreview(bool active, const rdcarray<WindowingSy
     }
   }
 
-  return CreateAndroidWindowingData(android_state->window);
+  WindowingData ret = {WindowingSystem::Unknown};
+
+  if(android_state->window)
+    ret = CreateAndroidWindowingData(android_state->window);
+
+  return ret;
 }
 
 void DisplayRendererPreview(IReplayController *renderer, TextureDisplay &displayCfg, uint32_t width,