History

Working on crash bugs

Brad Davis committed 10 years ago

Commit d428f3b1 parent cac317620 files · +246 −218Browse files

Showing the changes to interface/src/Application.cpp (1 of 20 files). Show all

Unified · Split

interface/src/Application.cpp+5−3
@@ -1122,8 +1122,6 @@ Application::~Application() { · 1121 unmodified lines
11221122 _octreeProcessor.terminate();
11231123 _entityEditSender.terminate();
11241124
1125− Menu::getInstance()->deleteLater();
1126−
11271125 _physicsEngine->setCharacterController(NULL);
11281126
11291127 ModelEntityItem::cleanupLoadedAnimations();
@@ -1168,6 +1166,10 @@ Application::~Application() { · 38 unmodified lines
11681166 #if 0
11691167 ConnexionClient::getInstance().destroy();
11701168 #endif
1169+ // The window takes ownership of the menu, so this has the side effect of destroying it.
1170+ _window->setMenuBar(nullptr);
1171+
1172+ _window->deleteLater();
11711173
11721174 qInstallMessageHandler(NULL); // NOTE: Do this as late as possible so we continue to get our log messages
11731175 }
@@ -1334,7 +1336,7 @@ void Application::initializeUi() { · 160 unmodified lines
13341336 _keyboardMouseDevice = std::dynamic_pointer_cast<KeyboardMouseDevice>(inputPlugin);
13351337 }
13361338 }
1337− Menu::setInstance();
1339+ _window->setMenuBar(new Menu());
13381340 updateInputModes();
13391341
13401342 auto compositorHelper = DependencyManager::get<CompositorHelper>();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t