Fix crash in nw.Window.Close()

rogerwang · rogerwang · commit 8798576e1d35 · 2019-05-29T21:39:42.000-06:00
part of nwjs#7059
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc
@@ -192,7 +192,8 @@ static HWND getHWND(AppWindow* window) {
 #endif
 
 void NwCurrentWindowInternalCloseFunction::DoClose(AppWindow* window) {
-  window->GetBaseWindow()->ForceClose();
+  if (window && window->GetBaseWindow())
+    window->GetBaseWindow()->ForceClose();
 }
 
 void NwCurrentWindowInternalCloseFunction::DoCloseBrowser(Browser* browser) {

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,8 @@ static HWND getHWND(AppWindow* window) {`
`192`	`192`	`#endif`
`193`	`193`
`194`	`194`	`void NwCurrentWindowInternalCloseFunction::DoClose(AppWindow* window) {`
`195`		`- window->GetBaseWindow()->ForceClose();`
	`195`	`+ if (window && window->GetBaseWindow())`
	`196`	`+ window->GetBaseWindow()->ForceClose();`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`void NwCurrentWindowInternalCloseFunction::DoCloseBrowser(Browser* browser) {`