From a5dad80454ca4b714cf186ae170505c9b8916ff1 Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Sun, 24 Sep 2017 19:59:54 +0200
Subject: [PATCH] Console: make ConsoleWindow immune to constructor ordering

---
 Console/ConsoleWindow.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Console/ConsoleWindow.cc b/Console/ConsoleWindow.cc
index a29187c887..32340be337 100644
--- a/Console/ConsoleWindow.cc
+++ b/Console/ConsoleWindow.cc
@@ -25,7 +25,7 @@ using namespace Retro;
 
 namespace
 {
-	std::unordered_map<WindowPtr, ConsoleWindow*>	windows;
+	std::unordered_map<WindowPtr, ConsoleWindow*>	*windows = NULL;
 }
 
 ConsoleWindow::ConsoleWindow(Rect r, ConstStr255Param title)
@@ -46,14 +46,16 @@ ConsoleWindow::ConsoleWindow(Rect r, ConstStr255Param title)
 	SetPort(port);
 	EraseRect(&portRect);
 
-	windows[win] = this;
+	if(!windows)
+		windows = new std::unordered_map<WindowPtr, ConsoleWindow*>();
+	(*windows)[win] = this;
 
 	Init(port, portRect);
 }
 
 ConsoleWindow::~ConsoleWindow()
 {
-	windows.erase(win);
+	windows->erase(win);
 	DisposeWindow(win);
 }
 
@@ -85,7 +87,7 @@ char ConsoleWindow::WaitNextChar()
 		{
 			case updateEvt:
 				eventWin = (WindowPtr)event.message;
-				realConsole = windows[(WindowPtr)event.message];
+				realConsole = (*windows)[(WindowPtr)event.message];
 				if(realConsole)
 				{
 					Rect updateRect;