[XB1] Release DX extended resources before Cobalt exit

b/299726093 Change-Id: Ic47bbf2f454c98a79a9203d0d040ab7a6c2dbdc2
youtube · Sep 29, 2023 · c922d06 · c922d06
1 parent 34a52ef
commit c922d06
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/starboard/shared/starboard/application.cc b/starboard/shared/starboard/application.cc
@@ -410,6 +410,10 @@ bool Application::DispatchAndDelete(Application::Event* event) {
 }
 
 bool Application::HandleEventAndUpdateState(Application::Event* event) {
+  // Don't accept any events in kStateStopped state
+  if (state_ == kStateStopped)
+    return true;
+
   // Ensure the event is deleted unless it is released.
   scoped_ptr<Event> scoped_event(event);
 

diff --git a/starboard/shared/uwp/application_uwp.cc b/starboard/shared/uwp/application_uwp.cc
@@ -1029,8 +1029,9 @@ void ApplicationUwp::Inject(Application::Event* event) {
   RunInMainThreadAsync([this, event]() {
     bool result = DispatchAndDelete(event);
     if (!result) {
-      NetLogFlushThenClose();
-      CoreApplication::Exit();
+      // Release ExtendedResourcesManager. This lets
+      // ApplicationUwp::InternalMain() to return
+      ExtendedResourcesManager::GetInstance()->Quit();
     }
   });
 }
@@ -1332,7 +1333,6 @@ int InternalMain() {
   extended_resources_manager.Run();
 
   NetLogFlushThenClose();
-  CoreApplication::Exit();
 
   MFShutdown();
   WSACleanup();