Skip to content

Commit

Permalink
Revert "勾选“单行和双行模式下不显示空白”选项时,如果最后一句歌词为空白,仍然显示空白 zhongyang219#528"
Browse files Browse the repository at this point in the history
This reverts commit 958bf83.
  • Loading branch information
lrisora committed Aug 23, 2023
1 parent 4ae6b95 commit fc73e1c
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions MusicPlayer2/Lyric.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,7 @@ CLyrics::Lyric CLyrics::GetLyric(Time time, bool is_next, bool ignore_blank, boo
int now_index{ GetLyricIndex(time) };
if (!ignore_blank) // 不忽略空行,返回原始歌词
return GetLyric(now_index + is_next);
if (now_index < GetLyricCount() - 1) //仅当没有到最后一句歌词时才进行此处理
now_index = GetLyricIndexIgnoreBlank(now_index, is_next); // 索引对齐到非空当前歌词
now_index = GetLyricIndexIgnoreBlank(now_index, is_next); // 索引对齐到非空当前歌词
int blank_time{ GetBlankTimeBeforeLyric(now_index) };
if (!blank2mark || blank_time < LYRIC_BLANK_IGNORE_TIME) // 不添加进度符号
return GetLyric(now_index);
Expand Down

0 comments on commit fc73e1c

Please sign in to comment.