fix merge

diff --git a/src/client.c b/src/client.c
index b5ef75d..5df785d 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -180,6 +180,7 @@ void client_set_state(struct client *cl, enum client_state st)
         if (no_active == 0) {
             session_alert_watch(cl->session, SESSION_WATCH_SHOW);
             session_alert_watch(cl->session, SESSION_WATCH_BYTARGET);
+            session_alert_watch(cl->session, SESSION_WATCH_TERMLIST);
             session_alert_watch(cl->session, SESSION_WATCH_SHOW_PREF);
         }
     }
@@ -551,6 +552,7 @@ void client_got_records(struct client *cl)
         client_unlock(cl);
         session_alert_watch(se, SESSION_WATCH_SHOW);
         session_alert_watch(se, SESSION_WATCH_BYTARGET);
+        session_alert_watch(se, SESSION_WATCH_TERMLIST);
         session_alert_watch(se, SESSION_WATCH_RECORD);
         client_lock(cl);
     }

diff --git a/src/session.h b/src/session.h
index 3255ac3..1e1687e 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -78,7 +78,7 @@ struct session_database
 #define SESSION_WATCH_SHOW_PREF 2
 #define SESSION_WATCH_TERMLIST  3
 #define SESSION_WATCH_BYTARGET  4
-#define SESSION_WATCH_MAX       3
+#define SESSION_WATCH_MAX       4
 
 #define SESSION_MAX_TERMLISTS 10