diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-02-10 20:46:24 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-02-10 20:46:24 +0000 |
| commit | 80fcfa7bce759f90d1e10af5e5c6d9da1a13a9ac (patch) | |
| tree | 43acc6476a2d2a878525c48c087aecac30eb2c91 /amiga | |
| parent | f69f7b5ee77c1e39fc32cd65e923511cb80f67b0 (diff) | |
| download | netsurf-80fcfa7bce759f90d1e10af5e5c6d9da1a13a9ac.tar.gz netsurf-80fcfa7bce759f90d1e10af5e5c6d9da1a13a9ac.tar.bz2 | |
Tidy-up; ami_try_quit is checking the window list now
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/gui.c | 119 |
1 files changed, 29 insertions, 90 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 63d355738..5234a7601 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1480,121 +1480,60 @@ void ami_handle_msg(void) gwin = node->objstruct; - if(node->Type == AMINS_TVWINDOW) - { - if(ami_tree_event((struct treeview_window *)gwin)) - { - if(IsMinListEmpty(window_list)) - { - /* last window closed, so exit */ - ami_try_quit(); - } + if(node->Type == AMINS_TVWINDOW) { + if(ami_tree_event((struct treeview_window *)gwin)) { + ami_try_quit(); break; - } - else - { + } else { node = nnode; continue; } - } - else if(node->Type == AMINS_FINDWINDOW) - { - if(ami_search_event()) - { - if(IsMinListEmpty(window_list)) - { - /* last window closed, so exit */ - ami_try_quit(); - } + } else if(node->Type == AMINS_FINDWINDOW) { + if(ami_search_event()) { + ami_try_quit(); break; - } - else - { + } else { node = nnode; continue; } - } - else if(node->Type == AMINS_HISTORYWINDOW) - { - if(ami_history_event((struct history_window *)gwin)) - { - if(IsMinListEmpty(window_list)) - { - /* last window closed, so exit */ - ami_try_quit(); - } + } else if(node->Type == AMINS_HISTORYWINDOW) { + if(ami_history_event((struct history_window *)gwin)) { + ami_try_quit(); break; - } - else - { + } else { node = nnode; continue; } - } - else if(node->Type == AMINS_PRINTWINDOW) - { - if(ami_print_event((struct ami_print_window *)gwin)) - { - if(IsMinListEmpty(window_list)) - { - /* last window closed, so exit */ - ami_try_quit(); - } + } else if(node->Type == AMINS_PRINTWINDOW) { + if(ami_print_event((struct ami_print_window *)gwin)) { + ami_try_quit(); break; - } - else - { + } else { node = nnode; continue; } - } - else if(node->Type == AMINS_GUIOPTSWINDOW) - { - if(ami_gui_opts_event()) - { - if(IsMinListEmpty(window_list)) - { - /* last window closed, so exit with conditions ;) */ - if(scrn) ami_try_quit(); - } + } else if(node->Type == AMINS_GUIOPTSWINDOW) { + if(ami_gui_opts_event()) { + /* last window possibly closed, so exit with conditions ;) */ + if(scrn) ami_try_quit(); break; - } - else - { + } else { node = nnode; continue; } - } - else if(node->Type == AMINS_DLWINDOW) - { - if(ami_download_window_event((struct gui_download_window *)gwin)) - { - if(IsMinListEmpty(window_list)) - { - /* last window closed, so exit */ - ami_try_quit(); - } + } else if(node->Type == AMINS_DLWINDOW) { + if(ami_download_window_event((struct gui_download_window *)gwin)) { + ami_try_quit(); break; - } - else - { + } else { node = nnode; continue; } - } - else if(node->Type == AMINS_LOGINWINDOW) - { - if(ami_401login_event((struct gui_login_window *)gwin)) - { - if(IsMinListEmpty(window_list)) - { - /* last window closed, so exit */ - ami_try_quit(); - } + } else if(node->Type == AMINS_LOGINWINDOW) { + if(ami_401login_event((struct gui_login_window *)gwin)) { + ami_try_quit(); break; - } - else - { + } else { node = nnode; continue; } |