aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-05-28 16:24:02 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-05-28 16:24:02 +0000
commit8536ad0ce72512ec8f98c4dda6c63bd765db14cc (patch)
tree3215700936584d0da464f63b4e54435bcbf7ec2e
parent3a55871d0427b45713d56938202a3e2265a428c1 (diff)
downloadrtmux-8536ad0ce72512ec8f98c4dda6c63bd765db14cc.tar.gz
rtmux-8536ad0ce72512ec8f98c4dda6c63bd765db14cc.tar.bz2
rtmux-8536ad0ce72512ec8f98c4dda6c63bd765db14cc.zip
Reset activity time to avoid relock on -U.
-rw-r--r--server-fn.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/server-fn.c b/server-fn.c
index ca74fd3d..245985ce 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -1,4 +1,4 @@
-/* $Id: server-fn.c,v 1.59 2009-04-27 17:27:36 nicm Exp $ */
+/* $Id: server-fn.c,v 1.60 2009-05-28 16:24:02 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -205,6 +205,7 @@ server_unlock(const char *s)
if (!server_locked)
return (0);
+ server_activity = time(NULL);
if (server_password != NULL) {
if (s == NULL)