X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0d737aa4f2ff203dc2264e8efec352d6b26eeb5d..0bd57c0f66354345eac1d1654a56860919254b4c:/mac/macdlg.c diff --git a/mac/macdlg.c b/mac/macdlg.c index cef7dea3..0b28cf9f 100644 --- a/mac/macdlg.c +++ b/mac/macdlg.c @@ -66,7 +66,6 @@ static void mac_config(int midsession) { Session *s; WinInfo *wi; - static struct sesslist sesslist; Str255 mactitle; char *str; @@ -77,6 +76,7 @@ static void mac_config(int midsession) memset(s, 0, sizeof(*s)); do_defaults(NULL, &s->cfg); s->hasfile = FALSE; + s->session_closed = FALSE; } /* Copy the configuration somewhere else in case this is a * @@ -89,9 +89,8 @@ static void mac_config(int midsession) else s->settings_window = GetNewWindow(wSettings, NULL, (WindowPtr)-1); - get_sesslist(&sesslist, TRUE); s->ctrlbox = ctrl_new_box(); - setup_config_box(s->ctrlbox, &sesslist, midsession, 0, 0); + setup_config_box(s->ctrlbox, midsession, 0, 0); s->settings_ctrls.data = &s->temp_cfg; if (midsession) @@ -238,7 +237,7 @@ static OSErr mac_opensessionfrom(FSSpec *fss) err = -9999; goto fail; } - load_open_settings(sesshandle, TRUE, &s->cfg); + load_open_settings(sesshandle, &s->cfg); close_settings_r(sesshandle); mac_startsession(s); @@ -322,7 +321,7 @@ void mac_savesession(void) assert(s->hasfile); sesshandle = open_settings_w_fsp(&s->savefile); if (sesshandle == NULL) return; /* XXX report error */ - save_open_settings(sesshandle, TRUE, &s->cfg); + save_open_settings(sesshandle, &s->cfg); close_settings_w(sesshandle); } @@ -343,7 +342,7 @@ void mac_savesessionas(void) } sesshandle = open_settings_w_fsp(&sfr.sfFile); if (sesshandle == NULL) return; /* XXX report error */ - save_open_settings(sesshandle, TRUE, &s->cfg); + save_open_settings(sesshandle, &s->cfg); close_settings_w(sesshandle); s->hasfile = TRUE; s->savefile = sfr.sfFile;