nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-09 15:18:06 -05:00
Code Issues Projects Releases Wiki Activity

Omit the conf_launchable check in pterm Duplicate Session.

Browse Source 
It won't return true, because pterm's use of conf is a bit nonstandard
(it doesn't really bother about the protocol field, and has no use for
either host names _or_ serial port filenames). Was affecting both
gtkapp and gtkmain based builds.
This commit is contained in:
Simon Tatham 2016-03-27 14:10:06 +01:00
parent 031a65e44d
commit a8d466c0ea
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unix/gtkapp.c
View File

@ -192,7 +192,8 @@ extern int cfgbox(Conf *conf);
void launch_duplicate_session(Conf *conf)
{
assert(conf_launchable(conf));
extern const int dup_check_launchable;
assert(!dup_check_launchable || conf_launchable(conf));
new_session_window(conf, NULL);
}

4
unix/gtkmain.c
View File

@ -582,11 +582,13 @@ int main(int argc, char **argv)
block_signal(SIGPIPE, 1);
if (argc > 1 && !strncmp(argv[1], "---", 3)) {
extern const int dup_check_launchable;
read_dupsession_data(conf, argv[1]);
/* Splatter this argument so it doesn't clutter a ps listing */
smemclr(argv[1], strlen(argv[1]));
assert(conf_launchable(conf));
assert(!dup_check_launchable || conf_launchable(conf));
need_config_box = FALSE;
} else {
/* By default, we bring up the config dialog, rather than launching

1
unix/uxpterm.c
View File

@ -10,6 +10,7 @@
const char *const appname = "pterm";
const int use_event_log = 0; /* pterm doesn't need it */
const int new_session = 0, saved_sessions = 0; /* or these */
const int dup_check_launchable = 0; /* no need to check host name in conf */
const int use_pty_argv = TRUE;
Backend *select_backend(Conf *conf)

1
unix/uxputty.c
View File

@ -53,6 +53,7 @@ int cfgbox(Conf *conf)
static int got_host = 0;
const int use_event_log = 1, new_session = 1, saved_sessions = 1;
const int dup_check_launchable = 1;
int process_nonoption_arg(const char *arg, Conf *conf, int *allow_launch)
{