From f6484c78e7d9eb6654799e347859d7925b3bbc52 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Thu, 23 May 2019 12:40:40 +0000
Subject: [PATCH] macOS: fix a crash at startup introduced in 75a09c8b.

---
 src/graphicswin.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/graphicswin.cpp b/src/graphicswin.cpp
index e904bab..f963724 100644
--- a/src/graphicswin.cpp
+++ b/src/graphicswin.cpp
@@ -397,13 +397,15 @@ void GraphicsWindow::Init() {
         window = Platform::CreateWindow();
         if(window) {
             using namespace std::placeholders;
+            // Do this first, so that if it causes an onRender event we don't try to paint without
+            // a canvas.
+            window->SetMinContentSize(720, 670);
             window->onClose = std::bind(&SolveSpaceUI::MenuFile, Command::EXIT);
             window->onRender = std::bind(&GraphicsWindow::Paint, this);
             window->onKeyboardEvent = std::bind(&GraphicsWindow::KeyboardEvent, this, _1);
             window->onMouseEvent = std::bind(&GraphicsWindow::MouseEvent, this, _1);
             window->onSixDofEvent = std::bind(&GraphicsWindow::SixDofEvent, this, _1);
             window->onEditingDone = std::bind(&GraphicsWindow::EditControlDone, this, _1);
-            window->SetMinContentSize(720, 670);
             PopulateMainMenu();
         }
     }