Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit f6d45049 authored by Albert Astals Cid's avatar Albert Astals Cid

Merge remote-tracking branch 'origin/KDE/4.14'

parents 263eb676 bf435556
......@@ -1215,9 +1215,14 @@ void PresentationWidget::startAutoChangeTimer()
double pageDuration = m_frameIndex >= 0 && m_frameIndex < (int)m_frames.count() ? m_frames[ m_frameIndex ]->page->duration() : -1;
if ( m_advanceSlides || pageDuration >= 0.0 )
{
double secs = pageDuration < 0.0
? Okular::SettingsCore::slidesAdvanceTime()
: qMin<double>( pageDuration, Okular::SettingsCore::slidesAdvanceTime() );
double secs;
if ( pageDuration < 0.0 )
secs = Okular::SettingsCore::slidesAdvanceTime();
else if ( m_advanceSlides )
secs = qMin<double>( pageDuration, Okular::SettingsCore::slidesAdvanceTime() );
else
secs = pageDuration;
m_nextPageTimer->start( (int)( secs * 1000 ) );
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment