Skip to content

Commit

Permalink
Fix scrub bar upon first opening a project file.
Browse files Browse the repository at this point in the history
  • Loading branch information
ddennedy committed Sep 30, 2014
1 parent 3b2ed6b commit 3701096
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -418,10 +418,10 @@ void Player::onProducerOpened(bool play)
m_selectedLabel->setText("--:--:--:--");
if (m_isSeekable) {
m_durationLabel->setText(QString(MLT.producer()->get_length_time()).prepend(" / "));
m_previousIn = MLT.producer()->get_in();
m_previousIn = MLT.isClip()? MLT.producer()->get_in() : -1;
m_scrubber->setEnabled(true);
m_scrubber->setInPoint(m_previousIn);
m_previousOut = MLT.producer()->get_out();
m_previousOut = MLT.isClip()? MLT.producer()->get_out() : -1;
m_scrubber->setOutPoint(m_previousOut);
}
else {
Expand Down Expand Up @@ -568,7 +568,7 @@ void Player::updateSelection()
m_selectedLabel->setText(MLT.producer()->frames_to_time(MLT.producer()->get_playtime()));
} else {
m_inPointLabel->setText("--:--:--:-- / ");
if (MLT.producer() && !MLT.isPlaylist() &&
if (MLT.producer() && MLT.isClip() &&
MLT.producer()->get_out() < m_duration - 1) {
m_selectedLabel->setText(MLT.producer()->frames_to_time(MLT.producer()->get_playtime()));
} else if (!MLT.producer() || MLT.producer()->get_in() == 0) {
Expand Down

0 comments on commit 3701096

Please sign in to comment.