From 14d2c9d595d20bf71ed6e16e0883df9b73f6f73e Mon Sep 17 00:00:00 2001
From: Christian Speckner <christian.speckner@mayflower.de>
Date: Tue, 20 Aug 2019 23:44:19 +0200
Subject: [PATCH] Revert "pretty hacked and ugly fix for #501"

This reverts commit a02384673479edc6f5f4e0b90ae0a45da07b7da6.
---
 src/emucore/Console.cxx      | 6 +-----
 src/emucore/EventHandler.cxx | 9 +++------
 src/emucore/EventHandler.hxx | 3 +--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx
index e00a381f1..3d65f698c 100644
--- a/src/emucore/Console.cxx
+++ b/src/emucore/Console.cxx
@@ -239,11 +239,7 @@ void Console::autodetectFrameLayout(bool reset)
   FrameLayoutDetector frameLayoutDetector;
   myTIA->setFrameManager(&frameLayoutDetector);
 
-  if(reset)
-  {
-    mySystem->reset(true);
-    myOSystem.eventHandler().handleConsoleStartupEvents(myRiot);
-  }
+  if (reset) mySystem->reset(true);
 
   for(int i = 0; i < 60; ++i) myTIA->update();
 
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index e82475825..716925cb5 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -35,6 +35,7 @@
 #include "RewindManager.hxx"
 #include "TimerManager.hxx"
 #include "Switches.hxx"
+#include "M6532.hxx"
 #include "MouseControl.hxx"
 #include "PNGLibrary.hxx"
 #include "TIASurface.hxx"
@@ -906,7 +907,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void EventHandler::handleConsoleStartupEvents(const std::unique_ptr<M6532>& riot)
+void EventHandler::handleConsoleStartupEvents()
 {
   bool update = false;
   if(myOSystem.settings().getBool("holdreset"))
@@ -947,11 +948,7 @@ void EventHandler::handleConsoleStartupEvents(const std::unique_ptr<M6532>& riot
     handleEvent(Event::JoystickOneFire);
 
   if(update)
-    if(riot != nullptr)
-      // TJ: This is ugly!
-      riot->update();
-    else
-      myOSystem.console().riot().update();
+    myOSystem.console().riot().update();
 
 #ifdef DEBUGGER_SUPPORT
   if(myOSystem.settings().getBool("debug"))
diff --git a/src/emucore/EventHandler.hxx b/src/emucore/EventHandler.hxx
index a3ce1f29f..daf267cc8 100644
--- a/src/emucore/EventHandler.hxx
+++ b/src/emucore/EventHandler.hxx
@@ -34,7 +34,6 @@ class PhysicalJoystick;
 #include "PJoystickHandler.hxx"
 #include "Variant.hxx"
 #include "bspf.hxx"
-#include "M6532.hxx"
 
 /**
   This class takes care of event remapping and dispatching for the
@@ -148,7 +147,7 @@ class EventHandler
       Handle events that must be processed each time a new console is
       created.  Typically, these are events set by commandline arguments.
     */
-    void handleConsoleStartupEvents(const std::unique_ptr<M6532>& riot = nullptr);
+    void handleConsoleStartupEvents();
 
     bool frying() const { return myFryingFlag; }