Fix nwjs#486: should delete Shell object on native window destruction

rogerwang · rogerwang · commit ad079b5f526b · 2013-08-17T16:13:11.000+08:00
Or the platform events will be sent, and then deleted Shell object
is referred.
diff --git a/src/api/app/app.cc b/src/api/app/app.cc
@@ -25,6 +25,7 @@
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "content/nw/src/api/api_messages.h"
+#include "content/nw/src/browser/native_window.h"
 #include "content/nw/src/browser/net_disk_cache_remover.h"
 #include "content/nw/src/nw_package.h"
 #include "content/nw/src/nw_shell.h"
@@ -131,7 +132,9 @@ void App::CloseAllWindows(bool force) {
     if (!windows[i]->is_devtools()) {
       // If there is no js object bound to the window, then just close.
       if (force || windows[i]->ShouldCloseWindow())
-        delete windows[i];
+        // we used to delete the Shell object here
+        // but it should be deleted on native window destruction
+        windows[i]->window()->Close();
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`#include "base/message_loop.h"`
`26`	`26`	`#include "base/values.h"`
`27`	`27`	`#include "content/nw/src/api/api_messages.h"`
	`28`	`+#include "content/nw/src/browser/native_window.h"`
`28`	`29`	`#include "content/nw/src/browser/net_disk_cache_remover.h"`
`29`	`30`	`#include "content/nw/src/nw_package.h"`
`30`	`31`	`#include "content/nw/src/nw_shell.h"`
`@@ -131,7 +132,9 @@ void App::CloseAllWindows(bool force) {`
`131`	`132`	`if (!windows[i]->is_devtools()) {`
`132`	`133`	`// If there is no js object bound to the window, then just close.`
`133`	`134`	`if (force \|\| windows[i]->ShouldCloseWindow())`
`134`		`- delete windows[i];`
	`135`	`+ // we used to delete the Shell object here`
	`136`	`+ // but it should be deleted on native window destruction`
	`137`	`+ windows[i]->window()->Close();`
`135`	`138`	`}`
`136`	`139`	`}`
`137`	`140`	`}`