From f23e6352fb890b1af2a1283a4f67f43f20d1d9ae Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Sat, 15 Nov 2014 14:06:26 +0000
Subject: [PATCH] Introjucer shutdown sequence fix.

---
 .../Source/Application/jucer_Application.h       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/extras/Introjucer/Source/Application/jucer_Application.h b/extras/Introjucer/Source/Application/jucer_Application.h
index 743109d616..6e4c09d394 100644
--- a/extras/Introjucer/Source/Application/jucer_Application.h
+++ b/extras/Introjucer/Source/Application/jucer_Application.h
@@ -104,16 +104,16 @@ public:
         utf8Window = nullptr;
         svgPathWindow = nullptr;
 
-       #if JUCE_MAC
-        MenuBarModel::setMacMainMenu (nullptr);
-       #endif
-        menuModel = nullptr;
-
         mainWindowList.forceCloseAllWindows();
         openDocumentManager.clear();
         commandManager = nullptr;
         settings = nullptr;
 
+       #if JUCE_MAC
+        MenuBarModel::setMacMainMenu (nullptr);
+       #endif
+        menuModel = nullptr;
+
         LookAndFeel::setDefaultLookAndFeel (nullptr);
 
         if (! isRunningCommandLine)
@@ -173,19 +173,19 @@ public:
             setApplicationCommandManagerToWatch (&getCommandManager());
         }
 
-        StringArray getMenuBarNames()
+        StringArray getMenuBarNames() override
         {
             return getApp().getMenuNames();
         }
 
-        PopupMenu getMenuForIndex (int /*topLevelMenuIndex*/, const String& menuName)
+        PopupMenu getMenuForIndex (int /*topLevelMenuIndex*/, const String& menuName) override
         {
             PopupMenu menu;
             getApp().createMenu (menu, menuName);
             return menu;
         }
 
-        void menuItemSelected (int menuItemID, int /*topLevelMenuIndex*/)
+        void menuItemSelected (int menuItemID, int /*topLevelMenuIndex*/) override
         {
             getApp().handleMainMenuCommand (menuItemID);
         }