diff options
author | Tiago Cunha <tcunha@gmx.com> | 2010-08-11 22:16:43 +0000 |
---|---|---|
committer | Tiago Cunha <tcunha@gmx.com> | 2010-08-11 22:16:43 +0000 |
commit | e34c6e2305ef3e04d570755360c25651c2fb199f (patch) | |
tree | e727e50e7a0b8f7a365c0256c1aa7ba10b366b95 /server-fn.c | |
parent | 761bd3c9e3abd835086fad770e32d00642b74591 (diff) | |
download | rtmux-e34c6e2305ef3e04d570755360c25651c2fb199f.tar.gz rtmux-e34c6e2305ef3e04d570755360c25651c2fb199f.tar.bz2 rtmux-e34c6e2305ef3e04d570755360c25651c2fb199f.zip |
Sync OpenBSD patchset 746:
Treat trying to link or move to the same window as an error to avoid
removing it accidentally.
Diffstat (limited to 'server-fn.c')
-rw-r--r-- | server-fn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-fn.c b/server-fn.c index 6c100398..5865c332 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.109 2010-08-09 21:44:25 tcunha Exp $ */ +/* $Id: server-fn.c,v 1.110 2010-08-11 22:16:43 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -281,7 +281,7 @@ server_link_window(struct session *src, struct winlink *srcwl, dstwl = winlink_find_by_index(&dst->windows, dstidx); if (dstwl != NULL) { if (dstwl->window == srcwl->window) - return (0); + return (-1); if (killflag) { /* * Can't use session_detach as it will destroy session |