The branch, master has been updated
via 7d98c51805b6d1c6996b4bc6a68107d4e6bb0038 (commit)
via c2bc84aa4dd30c46930994321de0541edf6a30e9 (commit)
via b7777e7ef37a6a5b9a231602c1ac66a307ae23db (commit)
via 91f6347485a2efe714cf0bc50e4d1fbc2a33c01e (commit)
from 94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5 (commit)
- Log -----------------------------------------------------------------
commit 7d98c51805b6d1c6996b4bc6a68107d4e6bb0038
Merge: 94a8ef1 c2bc84a
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Merge branch 'obsd-master'
cfg.c | 2 ++
cmd-find.c | 6 +++++-
2 files changed, 7 insertions(+), 1 deletions(-)
commit c2bc84aa4dd30c46930994321de0541edf6a30e9
Author: nicm <nicm>
Commit: nicm <nicm>
Do not include unattached clients when trying to find one for target.
---
cmd-find.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/cmd-find.c b/cmd-find.c
index 14124a3..f7c1ba7 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -125,11 +125,15 @@ cmd_find_best_client(struct client **clist, u_int csize)
c = NULL;
if (clist != NULL) {
for (i = 0; i < csize; i++) {
+ if (clist[i]->session == NULL)
+ continue;
if (cmd_find_client_better(clist[i], c))
c = clist[i];
}
} else {
TAILQ_FOREACH(c_loop, &clients, entry) {
+ if (c_loop->session == NULL)
+ continue;
if (cmd_find_client_better(c_loop, c))
c = c_loop;
}
commit b7777e7ef37a6a5b9a231602c1ac66a307ae23db
Author: nicm <nicm>
Commit: nicm <nicm>
Reset cfg_ncauses to 0 as well or we could allocate the wrong size if
called again.
---
cfg.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cfg.c b/cfg.c
index bacec99..8b44ce2 100644
--- a/cfg.c
+++ b/cfg.c
@@ -140,6 +140,7 @@ cfg_print_causes(struct cmd_q *cmdq)
free(cfg_causes);
cfg_causes = NULL;
+ cfg_ncauses = 0;
}
void
@@ -161,4 +162,5 @@ cfg_show_causes(struct session *s)
free(cfg_causes);
cfg_causes = NULL;
+ cfg_ncauses = 0;
}
commit 91f6347485a2efe714cf0bc50e4d1fbc2a33c01e
Author: nicm <nicm>
Commit: nicm <nicm>
Assign to the right variable when comparing clients.
---
cmd-find.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cmd-find.c b/cmd-find.c
index a71968a..14124a3 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -131,7 +131,7 @@ cmd_find_best_client(struct client **clist, u_int csize)
} else {
TAILQ_FOREACH(c_loop, &clients, entry) {
if (cmd_find_client_better(c_loop, c))
- c_loop = c;
+ c = c_loop;
}
}
return (c);
-----------------------------------------------------------------------
Summary of changes:
cfg.c | 2 ++
cmd-find.c | 6 +++++-
2 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
