The branch, master has been updated
via 9e0d7bddc0cef400077f9d2d84633a8bd4eddc01 (commit)
from aa0a57fd5681ffbae652bebebea04e1d90ac40ce (commit)
- Log -----------------------------------------------------------------
commit 9e0d7bddc0cef400077f9d2d84633a8bd4eddc01
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Don't boke when figuring out working directory from configuration file.
---
cmd-new-session.c | 2 +-
cmd-new-window.c | 2 +-
cmd-split-window.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 3ce2439..ad083a4 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -115,7 +115,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR);
}
cwd = fd;
- } else if (c->session == NULL)
+ } else if (c != NULL && c->session == NULL)
cwd = c->cwd;
else if ((c0 = cmd_current_client(cmdq)) != NULL)
cwd = c0->session->cwd;
diff --git a/cmd-new-window.c b/cmd-new-window.c
index f6a925b..5c2cbe4 100644
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -125,7 +125,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR);
}
cwd = fd;
- } else if (cmdq->client->session == NULL)
+ } else if (cmdq->client != NULL && cmdq->client->session == NULL)
cwd = cmdq->client->cwd;
else
cwd = s->cwd;
diff --git a/cmd-split-window.c b/cmd-split-window.c
index ef1d3cb..4bb069f 100644
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -102,7 +102,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR);
}
cwd = fd;
- } else if (cmdq->client->session == NULL)
+ } else if (cmdq->client != NULL && cmdq->client->session == NULL)
cwd = cmdq->client->cwd;
else
cwd = s->cwd;
-----------------------------------------------------------------------
Summary of changes:
cmd-new-session.c | 2 +-
cmd-new-window.c | 2 +-
cmd-split-window.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
