Skip to content

Avoid invalid subtitle add/remove paths near project end #1916

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
ddennedy merged 2 commits into from
Sep 22, 2026
Merged

Avoid invalid subtitle add/remove paths near project end #1916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19aad32
Initial plan
Copilot Sep 21, 2026
30c9ddb
Avoid invalid subtitle add/remove paths
Copilot Sep 21, 2026
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
20 changes: 14 additions & 6 deletions src/docks/subtitlesdock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,23 +773,31 @@ void SubtitlesDock::onCreateOrEditRequested()
void SubtitlesDock::onAddRequested()
{
LOG_DEBUG();
ensureTrackExists();
int64_t msTime = positionToMs(m_pos);
int trackIndex = m_trackCombo->currentIndex();
if (m_model->itemIndexAtTime(trackIndex, msTime) >= 0) {
if (trackIndex >= 0 && m_model->itemIndexAtTime(trackIndex, msTime) >= 0) {
MAIN.showStatusMessage(tr("A subtitle already exists at this time."));
return;
}
int64_t maxTime = m_model->maxTime();
int nextIndex = m_model->itemIndexAfterTime(trackIndex, msTime);
if (nextIndex > -1) {
auto nextItem = m_model->getItem(trackIndex, nextIndex);
maxTime = nextItem.start;
if (trackIndex >= 0) {
int nextIndex = m_model->itemIndexAfterTime(trackIndex, msTime);
if (nextIndex > -1) {
auto nextItem = m_model->getItem(trackIndex, nextIndex);
maxTime = nextItem.start;
}
}
if ((maxTime - msTime) < 500) {
MAIN.showStatusMessage(tr("Not enough space to add subtitle."));
return;
}
if (trackIndex < 0) {
ensureTrackExists();
trackIndex = m_trackCombo->currentIndex();
if (trackIndex < 0) {
return;
}
}
Subtitles::SubtitleItem item;
item.start = msTime;
item.end = msTime + DEFAULT_ITEM_DURATION;
Expand Down
1 change: 1 addition & 0 deletions src/models/subtitlesmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,7 @@ void SubtitlesModel::doRemoveTrack(int trackIndex)
LOG_DEBUG() << trackIndex;
if (trackIndex < 0 || trackIndex >= m_tracks.size()) {
LOG_ERROR() << "Invalid index" << trackIndex;
return;
}
beginRemoveRows(QModelIndex(), trackIndex, trackIndex);
m_tracks.remove(trackIndex);
Expand Down
Loading