Fix nwjs#6677: nw.App.closeAllWindows() crashes on Mac OSX

rogerwang · rogerwang · commit 24f306162300 · 2018-06-16T09:43:34.000+08:00
diff --git a/src/api/nw_app_api.cc b/src/api/nw_app_api.cc
@@ -60,19 +60,25 @@ NwAppQuitFunction::Run() {
   return RespondNow(NoArguments());
 }
 
-ExtensionFunction::ResponseAction
-NwAppCloseAllWindowsFunction::Run() {
-  AppWindowRegistry* registry = AppWindowRegistry::Get(browser_context());
-  if (!registry)
-    return RespondNow(Error(""));
-
+void NwAppCloseAllWindowsFunction::DoJob(AppWindowRegistry* registry, std::string id) {
   AppWindowRegistry::AppWindowList windows =
-    registry->GetAppWindowsForApp(extension()->id());
+    registry->GetAppWindowsForApp(id);
 
   for (AppWindow* window : windows) {
     if (window->NWCanClose())
       window->GetBaseWindow()->Close();
   }
+}
+
+ExtensionFunction::ResponseAction
+NwAppCloseAllWindowsFunction::Run() {
+  AppWindowRegistry* registry = AppWindowRegistry::Get(browser_context());
+  if (!registry)
+    return RespondNow(Error(""));
+  base::MessageLoop::current()->task_runner()->PostTask(
+        FROM_HERE,
+        base::Bind(&NwAppCloseAllWindowsFunction::DoJob, registry, extension()->id()));
+
   return RespondNow(NoArguments());
 }
 
diff --git a/src/api/nw_app_api.h b/src/api/nw_app_api.h
@@ -8,6 +8,7 @@
 #include "extensions/browser/extension_function.h"
 
 namespace extensions {
+class AppWindowRegistry;
 
 class NwAppQuitFunction : public UIThreadExtensionFunction {
  public:
@@ -27,6 +28,7 @@ class NwAppCloseAllWindowsFunction : public UIThreadExtensionFunction {
  public:
   NwAppCloseAllWindowsFunction() {}
 
+  static void DoJob(AppWindowRegistry* registry, std::string id);
  protected:
   ~NwAppCloseAllWindowsFunction() override {}
 
