From b775a83e00689c8f2f184e97a3b47dfff8fe628e Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Mon, 11 Oct 2010 14:21:54 +0000
Subject: [PATCH] Fixed crash in starting up the debugger; a re-disassemble
 should only occur after the debugger has started up completely.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2148 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 src/debugger/Debugger.cxx      | 4 ++--
 src/debugger/gui/RomWidget.hxx | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/debugger/Debugger.cxx b/src/debugger/Debugger.cxx
index d688c6f25..8098b7db3 100644
--- a/src/debugger/Debugger.cxx
+++ b/src/debugger/Debugger.cxx
@@ -614,8 +614,8 @@ void Debugger::setStartState()
   // Save initial state, but don't add it to the rewind list
   saveOldState(false);
 
-  // Force a re-disassemble
-  myRom->invalidate();
+  // Set the 're-disassemble' flag, but don't do it until the next scheduled time 
+  myRom->invalidate(false);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/debugger/gui/RomWidget.hxx b/src/debugger/gui/RomWidget.hxx
index 05f385769..ea5dbfaa5 100644
--- a/src/debugger/gui/RomWidget.hxx
+++ b/src/debugger/gui/RomWidget.hxx
@@ -42,7 +42,8 @@ class RomWidget : public Widget, public CommandSender
     RomWidget(GuiObject* boss, const GUI::Font& font, int x, int y);
     virtual ~RomWidget();
 
-    void invalidate() { myListIsDirty = true; loadConfig(); }
+    void invalidate(bool forcereload = true)
+	{ myListIsDirty = true; if(forcereload) loadConfig(); }
 
     void scrollTo(int line) { myRomList->setSelected(line); }
     void handleCommand(CommandSender* sender, int cmd, int data, int id);