From 1b4ab580f3940f2b1619d443a1df9cbde052c5e1 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <nicolas@viennot.biz>
Date: Wed, 23 Dec 2015 23:04:56 -0500
Subject: [PATCH] early SIGSEGV

---
 tmate-session.c | 1 -
 tmux.c          | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tmate-session.c b/tmate-session.c
index 802c9a9c..37038a16 100644
--- a/tmate-session.c
+++ b/tmate-session.c
@@ -110,7 +110,6 @@ void tmate_session_init(struct event_base *base)
 	tmate_session.ev_base = base;
 
 	ssh_set_log_callback(ssh_log_function);
-	tmate_catch_sigsegv();
 
 	tmate_encoder_init(&tmate_session.encoder);
 	tmate_decoder_init(&tmate_session.decoder);
diff --git a/tmux.c b/tmux.c
index be299d62..73a80360 100644
--- a/tmux.c
+++ b/tmux.c
@@ -31,6 +31,7 @@
 #include <unistd.h>
 
 #include "tmux.h"
+#include "tmate.h"
 
 #if defined(DEBUG) && defined(__OpenBSD__)
 extern char	*malloc_options;
@@ -219,6 +220,7 @@ main(int argc, char **argv)
 		flags = 0;
 
 #ifdef TMATE
+	tmate_catch_sigsegv();
 	flags |= CLIENT_256COLOURS | CLIENT_UTF8;
 #endif