Refactor: Moving RootData so it can become non-global state

1 files changed, 6 insertions, 1 deletions

diff --git a/src/ui/window.c b/src/ui/window.c
index 9732a4f9..ea2a4ec0 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -162,8 +162,13 @@ static void removeMacMenus_(void) {
 #endif
 
 static void setupUserInterface_Window(iWindow *d) {
+#if defined (iPlatformAppleDesktop)
+    insertMacMenus_();
+#endif
+    static iRootData rootData_;
+    setCurrent_Root(NULL, &rootData_);
     d->root = createUserInterface_Root();
-    setCurrent_Root(d->root);    
+    setCurrent_Root(d->root, &rootData_);
 }
 
 static void updateRootSize_Window_(iWindow *d, iBool notifyAlways) {