From f013e2d8c731fc7025ef4c2fcbd06e1b57ee6c6e Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 4 Nov 2015 23:28:13 -0800
Subject: [PATCH] Qt: Fix a crash in the memory viewer

---
 CHANGES                        | 1 +
 src/platform/qt/MemoryView.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 8109187c6..84c759178 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ Bugfixes:
  - VFS: Fix VFileReadline and remove _vfdReadline
  - Qt: Fix font size in memory viewer
  - GBA Memory: Fix DMA register writing behavior
+ - Qt: Fix a crash in the memory viewer
 Misc:
  - Qt: Window size command line options are now supported
  - Qt: Increase usability of key mapper
diff --git a/src/platform/qt/MemoryView.cpp b/src/platform/qt/MemoryView.cpp
index afcc1feb9..3b43592d2 100644
--- a/src/platform/qt/MemoryView.cpp
+++ b/src/platform/qt/MemoryView.cpp
@@ -80,6 +80,9 @@ void MemoryView::updateStatus() {
 		m_ui.uintVal->clear();
 		return;
 	}
+	if (!m_controller->isLoaded()) {
+		return;
+	}
 	ARMCore* cpu = m_controller->thread()->cpu;
 	union {
 		uint32_t u32;