From: Dennis Schafroth <dennis@indexdata.com>
Date: Fri, 4 Nov 2011 12:05:30 +0000 (+0100)
Subject: fix merge
X-Git-Tag: mobile-beta-1~18^2~1
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=c61b8edfe5b60d9394f4db7e26d6c08fec9d1452;p=pazpar2-moved-to-github.git

fix merge
---

c61b8edfe5b60d9394f4db7e26d6c08fec9d1452
diff --cc src/client.c
index b5ef75d,b5ef75d..5df785d
--- a/src/client.c
+++ b/src/client.c
@@@ -180,6 -180,6 +180,7 @@@ void client_set_state(struct client *cl
          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 -551,6 +552,7 @@@ void client_got_records(struct client *
          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);
      }