commit b7b429e2ff44be3963120c5b8b398fe5a29a78eb
author Vivien Nicolas <vnicolas@apple.com> Mon Sep 30 18:50:46 2024 +0200
committer GitHub <noreply@github.com> Mon Sep 30 16:50:46 2024 +0000
tree fc84b0bac65924ba83f7eab27e1dd7f33098bc7e
parent fa0b2996cf1c8901287753f90168938900153e71

[TV Apps] Change the shutdown ordering to prevent some crashes when both commissioner and server are enabled (#35843)

examples/platform/linux/AppMain.cpp

diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp
index 074f078..a2e341e 100644
--- a/examples/platform/linux/AppMain.cpp
+++ b/examples/platform/linux/AppMain.cpp
@@ -679,16 +679,16 @@
 
     ApplicationShutdown();
 
-#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
-    ShutdownCommissioner();
-#endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
-
 #if defined(ENABLE_CHIP_SHELL)
     shellThread.join();
 #endif
 
     Server::GetInstance().Shutdown();
 
+#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
+    ShutdownCommissioner();
+#endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
+
 #if ENABLE_TRACING
     tracing_setup.StopTracing();
 #endif