From dfe84e962be2cdf909279b55d125adcbab68a2ee Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 12 Jul 2019 12:22:06 +0100
Subject: [PATCH] Don't try to close ConstantBufferPreviewer window when
 loading capture

---
 qrenderdoc/Windows/ConstantBufferPreviewer.cpp | 11 ++++++++---
 qrenderdoc/Windows/ConstantBufferPreviewer.h   |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/qrenderdoc/Windows/ConstantBufferPreviewer.cpp b/qrenderdoc/Windows/ConstantBufferPreviewer.cpp
index 2d516f561..9441f3398 100644
--- a/qrenderdoc/Windows/ConstantBufferPreviewer.cpp
+++ b/qrenderdoc/Windows/ConstantBufferPreviewer.cpp
@@ -82,17 +82,22 @@ ConstantBufferPreviewer *ConstantBufferPreviewer::has(ShaderStage stage, uint32_
 
 void ConstantBufferPreviewer::OnCaptureLoaded()
 {
-  OnCaptureClosed();
+  Reset();
 }
 
 void ConstantBufferPreviewer::OnCaptureClosed()
+{
+  Reset();
+
+  ToolWindowManager::closeToolWindow(this);
+}
+
+void ConstantBufferPreviewer::Reset()
 {
   ui->variables->clear();
   ui->variables->clearInternalExpansions();
 
   ui->saveCSV->setEnabled(false);
-
-  ToolWindowManager::closeToolWindow(this);
 }
 
 void ConstantBufferPreviewer::OnEventChanged(uint32_t eventId)
diff --git a/qrenderdoc/Windows/ConstantBufferPreviewer.h b/qrenderdoc/Windows/ConstantBufferPreviewer.h
index a1f559050..33b1995d3 100644
--- a/qrenderdoc/Windows/ConstantBufferPreviewer.h
+++ b/qrenderdoc/Windows/ConstantBufferPreviewer.h
@@ -52,6 +52,7 @@ public:
   // ICaptureViewer
   void OnCaptureLoaded() override;
   void OnCaptureClosed() override;
+
   void OnSelectedEventChanged(uint32_t eventId) override {}
   void OnEventChanged(uint32_t eventId) override;
 
@@ -65,6 +66,8 @@ private slots:
   void processFormat(const QString &format);
 
 private:
+  void Reset();
+
   Ui::ConstantBufferPreviewer *ui;
   ICaptureContext &m_Ctx;