From 1e0edb95e2202bd58b424816c2f455bd936a3550 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Fri, 22 Dec 2006 22:32:49 +0000
Subject: [PATCH] Fixed issue with 'tiadefaults' only setting defaults for
 width and height. It now uses the defaults for xstart and ystart as well.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1231 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 stella/src/emucore/PropsSet.cxx   |  8 +++++---
 stella/src/emucore/Settings.cxx   |  6 +++---
 stella/src/gui/LauncherDialog.cxx | 12 ++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/stella/src/emucore/PropsSet.cxx b/stella/src/emucore/PropsSet.cxx
index 8081ddf50..43903e7b7 100644
--- a/stella/src/emucore/PropsSet.cxx
+++ b/stella/src/emucore/PropsSet.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: PropsSet.cxx,v 1.27 2006-12-13 17:09:10 stephena Exp $
+// $Id: PropsSet.cxx,v 1.28 2006-12-22 22:32:49 stephena Exp $
 //============================================================================
 
 #include <sstream>
@@ -119,8 +119,10 @@ void PropertiesSet::getMD5(const string& md5, Properties& properties,
   // Reset TIA positioning to defaults if option is enabled
   if(myOSystem->settings().getBool("tiadefaults"))
   {
-//    properties.set(Display_XStart, Properties::ourDefaultProperties[Display_XStart]);
-//    properties.set(Display_YStart, Properties::ourDefaultProperties[Display_YStart]);
+#if !defined(GP2X)   // Quick GP2X hack, it only wants defaults for width and height
+    properties.set(Display_XStart, Properties::ourDefaultProperties[Display_XStart]);
+    properties.set(Display_YStart, Properties::ourDefaultProperties[Display_YStart]);
+#endif
     properties.set(Display_Width,  Properties::ourDefaultProperties[Display_Width]);
     properties.set(Display_Height, Properties::ourDefaultProperties[Display_Height]);
   }
diff --git a/stella/src/emucore/Settings.cxx b/stella/src/emucore/Settings.cxx
index 47fa03231..92dc65fbf 100644
--- a/stella/src/emucore/Settings.cxx
+++ b/stella/src/emucore/Settings.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: Settings.cxx,v 1.105 2006-12-20 12:42:55 stephena Exp $
+// $Id: Settings.cxx,v 1.106 2006-12-22 22:32:49 stephena Exp $
 //============================================================================
 
 #include <cassert>
@@ -75,12 +75,12 @@ Settings::Settings(OSystem* osystem)
   setInternal("sssingle", "false");
 
   setInternal("romdir", "");
-  setInternal("rombrowse", "false");
+  setInternal("rombrowse", "true");
   setInternal("lastrom", "");
   setInternal("modtime", "");
   setInternal("debugheight", "0");
 
-  setInternal("tiadefaults", "true");
+  setInternal("tiadefaults", "false");
   setInternal("autoslot", "false");
   setInternal("fastscbios", "true");
 }
diff --git a/stella/src/gui/LauncherDialog.cxx b/stella/src/gui/LauncherDialog.cxx
index 11627c85c..cfe64c3dd 100644
--- a/stella/src/gui/LauncherDialog.cxx
+++ b/stella/src/gui/LauncherDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: LauncherDialog.cxx,v 1.61 2006-12-09 04:02:40 stephena Exp $
+// $Id: LauncherDialog.cxx,v 1.62 2006-12-22 22:32:49 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -285,10 +285,7 @@ void LauncherDialog::loadDirListing()
 
   // Add '[..]' to indicate previous folder
   if(myCurrentNode.hasParent())
-  {
-    const string& parent = myCurrentNode.getParent().path();
-    myGameList->appendGame(" [..]", parent, "", true);
-  }
+    myGameList->appendGame(" [..]", "", "", true);
 
   // Now add the directory entries
   for(unsigned int idx = 0; idx < files.size(); idx++)
@@ -440,7 +437,10 @@ void LauncherDialog::handleCommand(CommandSender* sender, int cmd,
         // Directory's should be selected (ie, enter them and redisplay)
         if(myBrowseModeFlag && myGameList->isDir(item))
         {
-          myCurrentNode = entry;
+          if(myGameList->name(item) == " [..]")
+            myCurrentNode = myCurrentNode.getParent();
+		  else
+            myCurrentNode = entry;
           updateListing();
         }
         else if(instance()->createConsole(entry))