Skip to content

Commit 05b9c5d

Browse files
committed
Fix issue WinMerge/winmerge#2370: Image Comparison : In Alpha Animation, dialogs hang winmerge (2)
1 parent b29ca08 commit 05b9c5d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/WinIMergeLib/ImgMergeWindow.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,8 +1476,8 @@ class CImgMergeWindow : public IImgMergeWindow
14761476
}
14771477
const auto actualCycle = tse - m_timerPrev;
14781478
const auto idealCycle =
1479-
std::chrono::milliseconds((wParam == 2) ? TIMER_INTERVAL_ANIM : TIMER_INTERVAL_BLINK);
1480-
m_timerNext = tse +((m_timerNext.count() == 0 || actualCycle < idealCycle) ? idealCycle : actualCycle);
1479+
std::chrono::milliseconds((m_buffer.GetOverlayMode() == OVERLAY_ALPHABLEND_ANIM) ? TIMER_INTERVAL_ANIM : TIMER_INTERVAL_BLINK);
1480+
m_timerNext = tse + ((m_timerNext.count() == 0 || actualCycle < idealCycle) ? idealCycle : actualCycle);
14811481
}
14821482
m_timerPrev = tse;
14831483
break;

0 commit comments

Comments
 (0)