Skip to content

Commit

Permalink
Fix issue WinMerge/winmerge#2370: Image Comparison : In Alpha Animati…
Browse files Browse the repository at this point in the history
…on, dialogs hang winmerge (2)
  • Loading branch information
sdottaka committed Jul 7, 2024
1 parent b29ca08 commit 05b9c5d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/WinIMergeLib/ImgMergeWindow.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1476,8 +1476,8 @@ class CImgMergeWindow : public IImgMergeWindow
}
const auto actualCycle = tse - m_timerPrev;
const auto idealCycle =
std::chrono::milliseconds((wParam == 2) ? TIMER_INTERVAL_ANIM : TIMER_INTERVAL_BLINK);
m_timerNext = tse +((m_timerNext.count() == 0 || actualCycle < idealCycle) ? idealCycle : actualCycle);
std::chrono::milliseconds((m_buffer.GetOverlayMode() == OVERLAY_ALPHABLEND_ANIM) ? TIMER_INTERVAL_ANIM : TIMER_INTERVAL_BLINK);
m_timerNext = tse + ((m_timerNext.count() == 0 || actualCycle < idealCycle) ? idealCycle : actualCycle);
}
m_timerPrev = tse;
break;
Expand Down

0 comments on commit 05b9c5d

Please sign in to comment.