From 05b9c5d809ed21708dd86b0b10b4240d70cb3020 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 8 Jul 2024 08:36:37 +0900 Subject: [PATCH] Fix issue winmerge/winmerge#2370: Image Comparison : In Alpha Animation, dialogs hang winmerge (2) --- src/WinIMergeLib/ImgMergeWindow.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WinIMergeLib/ImgMergeWindow.hpp b/src/WinIMergeLib/ImgMergeWindow.hpp index 43c188e..c8c62fb 100644 --- a/src/WinIMergeLib/ImgMergeWindow.hpp +++ b/src/WinIMergeLib/ImgMergeWindow.hpp @@ -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;