mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy-up; ami_try_quit is checking the window list now

This commit is contained in:
Chris Young 2014-02-10 20:46:24 +00:00
parent f69f7b5ee7
commit 80fcfa7bce
1 changed files with 29 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
amiga/gui.c
View File

@ -1480,121 +1480,60 @@ void ami_handle_msg(void)
gwin = node->objstruct; gwin = node->objstruct;
if(node->Type == AMINS_TVWINDOW) if(node->Type == AMINS_TVWINDOW) {
{ if(ami_tree_event((struct treeview_window *)gwin)) {
if(ami_tree_event((struct treeview_window *)gwin)) ami_try_quit();
{
if(IsMinListEmpty(window_list))
{
/* last window closed, so exit */
ami_try_quit();
}
break; break;
} } else {
else
{
node = nnode; node = nnode;
continue; continue;
} }
} } else if(node->Type == AMINS_FINDWINDOW) {
else if(node->Type == AMINS_FINDWINDOW) if(ami_search_event()) {
{ ami_try_quit();
if(ami_search_event())
{
if(IsMinListEmpty(window_list))
{
/* last window closed, so exit */
ami_try_quit();
}
break; break;
} } else {
else
{
node = nnode; node = nnode;
continue; continue;
} }
} } else if(node->Type == AMINS_HISTORYWINDOW) {
else if(node->Type == AMINS_HISTORYWINDOW) if(ami_history_event((struct history_window *)gwin)) {
{ ami_try_quit();
if(ami_history_event((struct history_window *)gwin))
{
if(IsMinListEmpty(window_list))
{
/* last window closed, so exit */
ami_try_quit();
}
break; break;
} } else {
else
{
node = nnode; node = nnode;
continue; continue;
} }
} } else if(node->Type == AMINS_PRINTWINDOW) {
else if(node->Type == AMINS_PRINTWINDOW) if(ami_print_event((struct ami_print_window *)gwin)) {
{ ami_try_quit();
if(ami_print_event((struct ami_print_window *)gwin))
{
if(IsMinListEmpty(window_list))
{
/* last window closed, so exit */
ami_try_quit();
}
break; break;
} } else {
else
{
node = nnode; node = nnode;
continue; continue;
} }
} } else if(node->Type == AMINS_GUIOPTSWINDOW) {
else if(node->Type == AMINS_GUIOPTSWINDOW) if(ami_gui_opts_event()) {
{ /* last window possibly closed, so exit with conditions ;) */
if(ami_gui_opts_event()) if(scrn) ami_try_quit();
{
if(IsMinListEmpty(window_list))
{
/* last window closed, so exit with conditions ;) */
if(scrn) ami_try_quit();
}
break; break;
} } else {
else
{
node = nnode; node = nnode;
continue; continue;
} }
} } else if(node->Type == AMINS_DLWINDOW) {
else if(node->Type == AMINS_DLWINDOW) if(ami_download_window_event((struct gui_download_window *)gwin)) {
{ ami_try_quit();
if(ami_download_window_event((struct gui_download_window *)gwin))
{
if(IsMinListEmpty(window_list))
{
/* last window closed, so exit */
ami_try_quit();
}
break; break;
} } else {
else
{
node = nnode; node = nnode;
continue; continue;
} }
} } else if(node->Type == AMINS_LOGINWINDOW) {
else if(node->Type == AMINS_LOGINWINDOW) if(ami_401login_event((struct gui_login_window *)gwin)) {
{ ami_try_quit();
if(ami_401login_event((struct gui_login_window *)gwin))
{
if(IsMinListEmpty(window_list))
{
/* last window closed, so exit */
ami_try_quit();
}
break; break;
} } else {
else
{
node = nnode; node = nnode;
continue; continue;
} }