Skip to content

Commit 4a38fb3

Browse files
committed
Fix the crash while exiting
1 parent 9fe8bf6 commit 4a38fb3

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

engine/source/editor/source/editor_ui.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ namespace Pilot
328328
}
329329
if (ImGui::MenuItem("Exit"))
330330
{
331+
g_editor_global_context.m_engine_runtime->shutdownEngine();
331332
exit(0);
332333
}
333334
ImGui::EndMenu();

engine/source/runtime/function/global/global_context.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ namespace Pilot
3131

3232
m_asset_manager = std::make_shared<AssetManager>();
3333

34+
m_physics_system = std::make_shared<PhysicsSystem>();
35+
3436
m_world_manager = std::make_shared<WorldManager>();
3537
m_world_manager->initialize();
3638

37-
m_physics_system = std::make_shared<PhysicsSystem>();
38-
3939
m_window_system = std::make_shared<WindowSystem>();
4040
WindowCreateInfo window_create_info;
4141
m_window_system->initialize(window_create_info);
@@ -58,16 +58,17 @@ namespace Pilot
5858

5959
m_window_system.reset();
6060

61-
m_physics_system.reset();
62-
6361
m_scene_manager.reset();
6462

6563
m_world_manager.reset();
6664

65+
m_physics_system.reset();
66+
6767
m_input_system.reset();
6868

6969
m_asset_manager.reset();
7070

71+
7172
m_logger_system.reset();
7273

7374
m_file_servcie.reset();

0 commit comments

Comments
 (0)