mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-19 02:32:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix new creating new window assert

Browse Source
This commit is contained in:
Vincent Sanders 2016-03-20 20:28:20 +00:00
parent c2f321010a
commit 78fd5ccbf6
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
windows/window.c
View File

@ -858,6 +858,36 @@ void win32_window_set_scroll(struct gui_window *w, int sx, int sy)
} }
/**
* Create a new window due to menu selection
*
* \param gw frontends graphical window.
* \return NSERROR_OK on success else appropriate error code.
*/
static nserror win32_open_new_window(struct gui_window *gw)
{
const char *addr;
nsurl *url;
nserror ret;
if (nsoption_charp(homepage_url) != NULL) {
addr = nsoption_charp(homepage_url);
} else {
addr = NETSURF_HOMEPAGE;
}
ret = nsurl_create(addr, &url);
if (ret == NSERROR_OK) {
ret = browser_window_create(BW_CREATE_HISTORY,
url,
NULL,
gw->bw,
NULL);
nsurl_unref(url);
}
return ret;
}
static LRESULT static LRESULT
nsws_window_command(HWND hwnd, nsws_window_command(HWND hwnd,
@ -868,7 +898,8 @@ nsws_window_command(HWND hwnd,
{ {
nserror ret; nserror ret;
LOG("notification_code %x identifier %x ctrl_window %p", notification_code, identifier, ctrl_window); LOG("notification_code %x identifier %x ctrl_window %p",
notification_code, identifier, ctrl_window);
switch(identifier) { switch(identifier) {
@ -888,11 +919,7 @@ nsws_window_command(HWND hwnd,
break; break;
case IDM_FILE_OPEN_WINDOW: case IDM_FILE_OPEN_WINDOW:
ret = browser_window_create(BW_CREATE_NONE, ret = win32_open_new_window(gw);
NULL,
NULL,
gw->bw,
NULL);
if (ret != NSERROR_OK) { if (ret != NSERROR_OK) {
warn_user(messages_get_errorcode(ret), 0); warn_user(messages_get_errorcode(ret), 0);
} }