Merge pull request #13053 from berak:highgui_win32_waitkey

572af764 · Alexander Alekhin · cceeca30 · cae2a535 · 572af764
Commit 572af764 authored Nov 06, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

window_w32.cpp modules/highgui/src/window_w32.cpp +1 -1

No files found.
--- a/modules/highgui/src/window_w32.cpp
+++ b/modules/highgui/src/window_w32.cpp
@@ -1976,7 +1976,7 @@ cvWaitKey( int delay )
        MSG message;
        int is_processed = 0;

-        if( delay <= 0 )
+        if( (delay <= 0) && hg_windows)
            GetMessage(&message, 0, 0, 0);
        else if( PeekMessage(&message, 0, 0, 0, PM_REMOVE) == FALSE )
        {