Merge pull request #7935 from alalek:fix_waitKey

8 years ago · b345c6e552
parent c0cde75d54 d015b55e6b
commit b345c6e552
1 changed files with 1 additions and 1 deletions
--- a/modules/highgui/src/window.cpp
+++ b/modules/highgui/src/window.cpp
@ -218,7 +218,7 @@ int cv::waitKey(int delay)
    if (use_legacy > 0)
        return code;
 #endif
-    return code & 0xff;
+    return (code != -1) ? (code & 0xff) : -1;
 }

 int cv::createTrackbar(const String& trackbarName, const String& winName,