diff options
| author | William Wilgus <wilgus.william@gmail.com> | 2022-11-21 22:51:38 -0500 |
|---|---|---|
| committer | William Wilgus <me.theuser@yahoo.com> | 2022-11-21 22:54:54 -0500 |
| commit | d077fec5f1c4f7107cde44e816e8cc8c5f5b0833 (patch) | |
| tree | c8529e61a31b4b39f0b75c83a82a43204e2cdadc | |
| parent | efdc6feddbb52a8e274abc8b2c682199590b0c54 (diff) | |
| download | rockbox-d077fec5f1.tar.gz rockbox-d077fec5f1.zip | |
tree.c move voice filetypes to its own conditional
Change-Id: I3a5171378355e64192de1e29f62d52e03771afe4
| -rw-r--r-- | apps/tree.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/apps/tree.c b/apps/tree.c index d945b721b4..af177e3c1a 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -257,9 +257,6 @@ static int tree_voice_cb(int selected_item, void * data) talk_id(is_dir ? VOICE_DIR : VOICE_FILE, false); talk_number(selected_item+1 - (is_dir ? 0 : local_tc->dirsindir), true); - if(global_settings.talk_filetype - && !is_dir && *local_tc->dirfilter < NUM_FILTER_MODES) - say_filetype(attr); break; case 2: /* spelled */ talk_shutup(); @@ -267,13 +264,18 @@ static int tree_voice_cb(int selected_item, void * data) { if(is_dir) talk_id(VOICE_DIR, true); - else if(*local_tc->dirfilter < NUM_FILTER_MODES) - say_filetype(attr); } talk_spell(name, true); break; } } + + if(global_settings.talk_filetype && !is_dir + && *local_tc->dirfilter < NUM_FILTER_MODES) + { + say_filetype(attr); + } + return 0; } |