Fix nwjs#6766: Opening DevTools causes Crash when DevTools are open already

rogerwang · rogerwang · commit 3a8a491d0847 · 2018-08-20T02:28:32.000-06:00
The extension function's lifecyle is handled correctly now.
It's also referenced in extensions/browser/extension_function_dispatcher.cc
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc
@@ -154,8 +154,8 @@ NwCurrentWindowInternalCloseFunction::Run() {
 }
 
 void NwCurrentWindowInternalShowDevToolsInternalFunction::OnOpened() {
-  Release();
   Respond(NoArguments());
+  Release();
 }
 
 ExtensionFunction::ResponseAction
@@ -167,12 +167,12 @@ NwCurrentWindowInternalShowDevToolsInternalFunction::Run() {
   DevToolsWindow::OpenDevToolsWindow(web_contents);
   DevToolsWindow* devtools_window =
       DevToolsWindow::FindDevToolsWindow(agent.get());
-  if (devtools_window)
-    devtools_window->SetLoadCompletedCallback(base::Bind(&NwCurrentWindowInternalShowDevToolsInternalFunction::OnOpened, this));
-  else
+  if (devtools_window) {
+    AddRef();
+    devtools_window->SetLoadCompletedCallback(base::Bind(&NwCurrentWindowInternalShowDevToolsInternalFunction::OnOpened, base::Unretained(this)));
+  } else
     return RespondNow(NoArguments());
 
-  AddRef();
   return RespondLater();
 }
 
