From 1453c8e7872dedc72ebaf3d77931545fbfe5dd85 Mon Sep 17 00:00:00 2001 From: Timothy Stack Date: Mon, 24 Feb 2014 16:05:29 -0800 Subject: [PATCH] [sql] do not switch to the DB view if only the log_line column is selected Fixes #78 --- src/lnav.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/lnav.cc b/src/lnav.cc index b59e287f..0fe2b210 100644 --- a/src/lnav.cc +++ b/src/lnav.cc @@ -2365,8 +2365,17 @@ static void rl_callback(void *dummy, readline_curses *rc) lnav_data.ld_views[LNV_DB].set_left(0); if (dls.dls_rows.size() > 0) { + vis_bookmarks &bm = + lnav_data.ld_views[LNV_LOG].get_bookmarks(); - if (dls.dls_rows.size() == 1) { + if (dls.dls_headers.size() == 1 && !bm[&BM_QUERY].empty()) { + rc->set_value(""); + rc->set_alt_value(HELP_MSG_2( + y, Y, + "to move forward/backward through query results " + "in the log view")); + } + else if (dls.dls_rows.size() == 1) { string row; hs.text_value_for_line(lnav_data.ld_views[LNV_DB], 1, row, true);