Skip to content

Fix early exit with stop-at-end when commits remain in queue #365

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

Open
enmaku wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Fix early exit with stop-at-end when commits remain in queue #365

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
6 changes: 3 additions & 3 deletions src/gource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@ void Gource::updateUsers(float t, float dt) {
}
}

if(users.empty() && stop_position_reached) {
if(users.empty() && stop_position_reached && commitqueue.empty()) {
appFinished = true;
}

Expand Down Expand Up @@ -1745,8 +1745,8 @@ void Gource::logic(float t, float dt) {

RCommit commit = commitqueue.front();

//auto skip ahead, unless stop_position_reached
if(gGourceSettings.auto_skip_seconds>=0.0 && idle_time >= gGourceSettings.auto_skip_seconds && !stop_position_reached) {
//auto skip ahead, unless stop_position_reached (still allow skip while commits remain queued)
if(gGourceSettings.auto_skip_seconds>=0.0 && idle_time >= gGourceSettings.auto_skip_seconds && (!stop_position_reached || !commitqueue.empty())) {
currtime = lasttime = commit.timestamp;
idle_time = 0.0;
}
Expand Down