diff --git a/stella/src/common/mainSDL.cxx b/stella/src/common/mainSDL.cxx
index 41c2bc5ff..517c7a528 100644
--- a/stella/src/common/mainSDL.cxx
+++ b/stella/src/common/mainSDL.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: mainSDL.cxx,v 1.44 2005-06-16 00:55:56 stephena Exp $
+// $Id: mainSDL.cxx,v 1.45 2005-06-16 16:36:48 urchlay Exp $
 //============================================================================
 
 #include <fstream>
@@ -152,7 +152,7 @@ int main(int argc, char* argv[])
   }
 
   // Request that the SDL window be centered, if possible
-  putenv("SDL_VIDEO_CENTERED=1");
+  //	putenv("SDL_VIDEO_CENTERED=1");
 
   // Create the framebuffer(s)
   if(!theOSystem->createFrameBuffer())
diff --git a/stella/src/emucore/EventHandler.cxx b/stella/src/emucore/EventHandler.cxx
index e761ff99a..71558174f 100644
--- a/stella/src/emucore/EventHandler.cxx
+++ b/stella/src/emucore/EventHandler.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: EventHandler.cxx,v 1.74 2005-06-16 00:55:58 stephena Exp $
+// $Id: EventHandler.cxx,v 1.75 2005-06-16 16:36:49 urchlay Exp $
 //============================================================================
 
 #include <algorithm>
@@ -1317,6 +1317,10 @@ void EventHandler::leaveMenuMode()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void EventHandler::enterDebugMode()
 {
+  // paranoia: this should never happen:
+  if(myState == S_DEBUGGER)
+    return;
+
   myState = S_DEBUGGER;
   myOSystem->createFrameBuffer();
   myOSystem->debugger().reStack();