Merge pull request #4689 from wwylele/server-leak

ServiceFrameworkBase: remove ownership to ServerPort
2019-03-24 14:29:41 -04:00
parent 941248466b 8750b81ce0
commit c1de8acfe5
3 changed files with 2 additions and 10 deletions
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@ -293,7 +293,6 @@ void System::Shutdown() {
    // Shutdown emulation session
    GDBStub::Shutdown();
    VideoCore::Shutdown();
-    kernel.reset();
    HW::Shutdown();
    telemetry_session.reset();
    rpc_server.reset();
@ -301,6 +300,7 @@ void System::Shutdown() {
    service_manager.reset();
    dsp_core.reset();
    cpu_core.reset();
+    kernel.reset();
    timing.reset();
    app_loader.reset();