From a9e1c46e46b181ffb78d26852ebce94341316c15 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 23 Mar 2020 11:00:01 +0000
Subject: [PATCH] Fix crash if some settings aren't available e.g. due to the
 platform

---
 qrenderdoc/Windows/Dialogs/SettingsDialog.cpp | 63 ++++++++++++++++---
 1 file changed, 55 insertions(+), 8 deletions(-)

diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp b/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp
index 20871f309..8dddcdf3d 100644
--- a/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp
+++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp
@@ -122,19 +122,11 @@ SettingsDialog::SettingsDialog(ICaptureContext &ctx, QWidget *parent)
   ui->deleteShaderTool->setEnabled(false);
   ui->editShaderTool->setEnabled(false);
 
-  ui->ExternalTool_RGPIntegration->setChecked(RENDERDOC_GetConfigSetting("AMD.RGP.Enable")->AsBool());
   ui->ExternalTool_RadeonGPUProfiler->setText(m_Ctx.Config().ExternalTool_RadeonGPUProfiler);
 
-  ui->Android_SDKPath->setText(RENDERDOC_GetConfigSetting("Android.SDKDirPath")->AsString());
-  ui->Android_JDKPath->setText(RENDERDOC_GetConfigSetting("Android.JDKDirPath")->AsString());
-  ui->Android_MaxConnectTimeout->setValue(
-      RENDERDOC_GetConfigSetting("Android.MaxConnectTimeout")->AsUInt32());
-
   ui->TextureViewer_ResetRange->setChecked(m_Ctx.Config().TextureViewer_ResetRange);
   ui->TextureViewer_PerTexSettings->setChecked(m_Ctx.Config().TextureViewer_PerTexSettings);
   ui->TextureViewer_PerTexYFlip->setChecked(m_Ctx.Config().TextureViewer_PerTexYFlip);
-  ui->ShaderViewer_FriendlyNaming->setChecked(
-      RENDERDOC_GetConfigSetting("DXBC.Disassembly.FriendlyNaming")->AsBool());
   ui->CheckUpdate_AllowChecks->setChecked(m_Ctx.Config().CheckUpdate_AllowChecks);
   ui->Font_PreferMonospaced->setChecked(m_Ctx.Config().Font_PreferMonospaced);
 
@@ -142,6 +134,61 @@ SettingsDialog::SettingsDialog(ICaptureContext &ctx, QWidget *parent)
 
   ui->AlwaysReplayLocally->setChecked(m_Ctx.Config().AlwaysReplayLocally);
 
+  {
+    const SDObject *getPaths = RENDERDOC_GetConfigSetting("DXBC.Debug.SearchDirPaths");
+    if(!getPaths)
+    {
+      ui->chooseSearchPaths->setEnabled(false);
+    }
+  }
+
+  if(const SDObject *setting = RENDERDOC_GetConfigSetting("DXBC.Disassembly.FriendlyNaming"))
+  {
+    ui->ShaderViewer_FriendlyNaming->setChecked(setting->AsBool());
+  }
+  else
+  {
+    ui->ShaderViewer_FriendlyNaming->setEnabled(false);
+  }
+
+  if(const SDObject *setting = RENDERDOC_GetConfigSetting("AMD.RGP.Enable"))
+  {
+    ui->ExternalTool_RGPIntegration->setChecked(setting->AsBool());
+  }
+  else
+  {
+    ui->ExternalTool_RGPIntegration->setEnabled(false);
+  }
+
+  if(const SDObject *setting = RENDERDOC_GetConfigSetting("Android.SDKDirPath"))
+  {
+    ui->Android_SDKPath->setText(setting->AsString());
+  }
+  else
+  {
+    ui->Android_SDKPath->setEnabled(false);
+    ui->browseAndroidSDKPath->setEnabled(false);
+  }
+
+  if(const SDObject *setting = RENDERDOC_GetConfigSetting("Android.JDKDirPath"))
+  {
+    ui->Android_JDKPath->setText(setting->AsString());
+  }
+  else
+  {
+    ui->Android_JDKPath->setEnabled(false);
+    ui->browseJDKPath->setEnabled(false);
+  }
+
+  if(const SDObject *setting = RENDERDOC_GetConfigSetting("Android.MaxConnectTimeout"))
+  {
+    ui->Android_MaxConnectTimeout->setValue(setting->AsUInt32());
+  }
+  else
+  {
+    ui->Android_MaxConnectTimeout->setEnabled(false);
+  }
+
 #if RENDERDOC_ANALYTICS_ENABLE
   if(m_Ctx.Config().Analytics_TotalOptOut)
   {