Skip to content
Snippets Groups Projects
Commit f863e99e authored by d.kilic's avatar d.kilic
Browse files

Merge branch '111-looping-warning' into 'master'

Resolve "Looping warning"

Closes #111

See merge request !65
parents ea230a04 77c31b75
No related branches found
No related tags found
1 merge request!65Resolve "Looping warning"
Pipeline #27324 canceled
......@@ -414,13 +414,12 @@ void Player::playVideo(){
debout << "Warning: video unexpectedly finished." << std::endl;
}
}else{
if(mMainWindow->getControlWidget()->trackOnlineCalc->checkState() == Qt::Checked)
if( mLooping && mMainWindow->getControlWidget()->trackOnlineCalc->checkState() == Qt::Checked)
{
QMessageBox::warning(this, "Error: No tracking while looping", "Looping and tracking are incompatible. Please disable one first.");
mState = PlayerState::PAUSE;
break;
}
if(mLooping)
}else if(mLooping)
{
if(mState == PlayerState::FORWARD && mAnimation->getCurrentFrameNum() == mAnimation->getSourceOutFrameNum())
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment