From 189f10f20151ea33e162eaa926fae8386e6f0789 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Tue, 30 Jul 2013 21:43:20 +0000
Subject: [PATCH] InputTextDialog used in debugger RamWidget wasn't closing
 properly on exit; it attempted to close the debugger dialog instead!

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2775 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 Changes.txt                    | 4 ++++
 src/debugger/gui/RamWidget.cxx | 4 ++--
 src/gui/GameInfoDialog.cxx     | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Changes.txt b/Changes.txt
index 92bddf8b6..166c43864 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -23,6 +23,10 @@
       - Fixed bug in display of current TIA frame in the UI; depending on
         how breakpoints were set, it was sometimes off by one.
 
+      - Fixed RAM widget Search/Compare textboxes; entering any data and
+        then pressing 'Enter' / clicking 'OK' locked the UI until exiting
+        and re-entering the debugger.
+
       - Changed display for various TIA position counters to decimal
         (from hex) in the TIA tab.  Related to this, all data input
         widgets in the UI now have the ability to enter binary,
diff --git a/src/debugger/gui/RamWidget.cxx b/src/debugger/gui/RamWidget.cxx
index 3fc6c1c6e..1c3f76250 100644
--- a/src/debugger/gui/RamWidget.cxx
+++ b/src/debugger/gui/RamWidget.cxx
@@ -227,7 +227,7 @@ void RamWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
       if(result != "")
         myInputBox->setTitle(result);
       else
-        dialog().close();
+        myInputBox->close();
       break;
     }
 
@@ -237,7 +237,7 @@ void RamWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
       if(result != "")
         myInputBox->setTitle(result);
       else
-        dialog().close();
+        myInputBox->close();
       break;
     }
 
diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx
index 8bc901006..4ed44acc6 100644
--- a/src/gui/GameInfoDialog.cxx
+++ b/src/gui/GameInfoDialog.cxx
@@ -477,8 +477,8 @@ void GameInfoDialog::loadView()
   else
   {
     myMouseControl->setSelectedIndex(1);
-    myMouseX->setSelected(Variant(mcontrol[0] - '0'));
-    myMouseY->setSelected(Variant(mcontrol[1] - '0'));
+    myMouseX->setSelected(mcontrol[0] - '0');
+    myMouseY->setSelected(mcontrol[1] - '0');
   }
   myMouseX->setEnabled(!autoAxis);
   myMouseY->setEnabled(!autoAxis);