From 7339be3c00744efb64df9e40e4736e01b86ae99a Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 25 Apr 2015 13:19:37 +0200 Subject: [PATCH] Fix crash if Ctrl-C is pressed while no log is loaded --- renderdocui/Windows/APIInspector.cs | 4 ++++ renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs | 2 ++ renderdocui/Windows/TextureViewer.cs | 2 ++ 3 files changed, 8 insertions(+) diff --git a/renderdocui/Windows/APIInspector.cs b/renderdocui/Windows/APIInspector.cs index a841ba524..73d70ec98 100644 --- a/renderdocui/Windows/APIInspector.cs +++ b/renderdocui/Windows/APIInspector.cs @@ -265,6 +265,8 @@ namespace renderdocui.Windows private void apiEvents_KeyDown(object sender, KeyEventArgs e) { + if (!m_Core.LogLoaded) return; + if (e.KeyCode == Keys.C && e.Control) { string text = ""; @@ -279,6 +281,8 @@ namespace renderdocui.Windows private void callstack_KeyDown(object sender, KeyEventArgs e) { + if (!m_Core.LogLoaded) return; + if (e.KeyCode == Keys.C && e.Control) { string text = ""; diff --git a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs index 60f26bb52..5003cd1b8 100644 --- a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs +++ b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs @@ -255,6 +255,8 @@ namespace renderdocui.Controls private void variables_KeyDown(object sender, KeyEventArgs e) { + if (!m_Core.LogLoaded) return; + if (e.KeyCode == Keys.C && e.Control) { int[] width = new int[] { 0, 0, 0 }; diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs index 603bfdae6..cae08e714 100644 --- a/renderdocui/Windows/TextureViewer.cs +++ b/renderdocui/Windows/TextureViewer.cs @@ -2229,6 +2229,8 @@ namespace renderdocui.Windows Clipboard.SetText(texStatusDim.Text + " | " + statusLabel.Text); } + if (!m_Core.LogLoaded) return; + if (e.KeyCode == Keys.Up && m_PickedPoint.Y > 0) { m_PickedPoint = new Point(m_PickedPoint.X, m_PickedPoint.Y - 1);