Skip to content

Commit 4734b8a

Browse files
committed
[hotkeys] ignore the user pressing "t" when TEXT is the only view on the stack
Related to #1420
1 parent 90825c8 commit 4734b8a

1 file changed

Lines changed: 18 additions & 11 deletions

File tree

src/hotkeys.cc

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -340,23 +340,21 @@ DELETE FROM lnav_user_notifications WHERE id = 'org.lnav.mouse-support'
340340
if ((lnav_data.ld_zoom_level - 1) < 0) {
341341
alerter::singleton().chime("maximum zoom-in level reached");
342342
} else {
343-
ec.execute(
344-
INTERNAL_SRC_LOC,
345-
fmt::format(
346-
FMT_STRING(":zoom-to {}"),
347-
lnav_zoom_strings[lnav_data.ld_zoom_level - 1]));
343+
ec.execute(INTERNAL_SRC_LOC,
344+
fmt::format(
345+
FMT_STRING(":zoom-to {}"),
346+
lnav_zoom_strings[lnav_data.ld_zoom_level - 1]));
348347
}
349348
break;
350349

351350
case 'Z':
352351
if ((lnav_data.ld_zoom_level + 1) >= ZOOM_COUNT) {
353352
alerter::singleton().chime("maximum zoom-out level reached");
354353
} else {
355-
ec.execute(
356-
INTERNAL_SRC_LOC,
357-
fmt::format(
358-
FMT_STRING(":zoom-to {}"),
359-
lnav_zoom_strings[lnav_data.ld_zoom_level + 1]));
354+
ec.execute(INTERNAL_SRC_LOC,
355+
fmt::format(
356+
FMT_STRING(":zoom-to {}"),
357+
lnav_zoom_strings[lnav_data.ld_zoom_level + 1]));
360358
}
361359
break;
362360

@@ -693,7 +691,16 @@ DELETE FROM lnav_user_notifications WHERE id = 'org.lnav.mouse-support'
693691
break;
694692

695693
case 't':
696-
if (lnav_data.ld_text_source.current_file() == nullptr) {
694+
if (lnav_data.ld_view_stack.size() == 2
695+
&& lnav_data.ld_log_source.file_count() == 0
696+
&& lnav_data.ld_view_stack.top().value_or(nullptr)
697+
== &lnav_data.ld_views[LNV_TEXT])
698+
{
699+
prompt.p_editor.set_inactive_value(
700+
lnav::console::user_message::info(
701+
"Already in the TEXT view")
702+
.to_attr_line());
703+
} else if (lnav_data.ld_text_source.current_file() == nullptr) {
697704
alerter::singleton().chime("No text files loaded");
698705
prompt.p_editor.set_inactive_value(
699706
lnav::console::user_message::error("No text files loaded")

0 commit comments

Comments
 (0)