Skip to content

Fix crash with empty files #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leplatrem merged 1 commit into from
Mar 8, 2026
Merged

Fix crash with empty files #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ void Player::timeout() {
void Player::autoHideTimeout() {
if (m_autoHideDuration > 0) {
m_autoHideDuration -= m_timerAutoHide.interval();
emit pulse(tick() - m_pauseStart + m_lastSubtitles.at(0)->msseStart());
if (!m_lastSubtitles.isEmpty())
emit pulse(tick() - m_pauseStart + m_lastSubtitles.at(0)->msseStart());
} else {
emit autoHide();
m_timerAutoHide.stop();
Expand Down Expand Up @@ -115,7 +116,7 @@ const QList<Subtitle *> Player::current() const { return m_lastSubtitles; }

void Player::updateCurrent(quint64 msecsElapsed) {
// Sanity check
if (m_script == 0)
if (m_script == nullptr)
return;
// Find subtitles that match elapsed time
QList<Subtitle *> currentSubtitles = m_script->currentSubtitles(msecsElapsed);
Expand Down
15 changes: 13 additions & 2 deletions src/script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ Script::Script(const QString &p_fileName, int p_charsRate,

Script::ScriptFormat Script::format() const { return m_format; }

quint64 Script::totalDuration() const { return m_subtitles.last()->msseEnd(); }
quint64 Script::totalDuration() const {
if (m_subtitles.isEmpty())
return 0;
return m_subtitles.last()->msseEnd();
}

const QString &Script::fileName() const { return m_fileName; }

Expand All @@ -112,8 +116,11 @@ int Script::subtitleMinDuration() const { return m_subtitleMinDuration; };

SubtitleStyle *Script::style(const QString &p_name) const {
// If style is unknown, return first one.
if (!m_styles.contains(p_name))
if (!m_styles.contains(p_name)) {
if (m_styles.isEmpty())
return nullptr;
return m_styles[m_styles.keys().at(0)];
}
return m_styles[p_name];
}

Expand Down Expand Up @@ -394,6 +401,8 @@ void Script::loadFromSrt(QStringList content) {
new SubtitleStyle(tr("Default"), font, Qt::white, this);
m_styles[style->name()] = style;

if (content.isEmpty())
return;
// Make sure its ends with empty line
if (!content.last().isEmpty())
content.append(QString());
Expand Down Expand Up @@ -443,6 +452,8 @@ void Script::loadFromTxt(QStringList content) {
new SubtitleStyle(tr("Default"), font, Qt::white, this);
m_styles[style->name()] = style;

if (content.isEmpty())
return;
// Make sure its ends with empty line
if (!content.last().isEmpty())
content.append(QString());
Expand Down