Macintosh-Tools
/
Retro68
mirror of https://github.com/autc04/Retro68.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Console: make ConsoleWindow immune to constructor ordering

This commit is contained in:
Wolfgang Thaller 2017-09-24 19:59:54 +02:00
parent 284126e13c
commit a5dad80454
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Console/ConsoleWindow.cc
View File

@ -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;