Merge pull request opencv#7935 from alalek:fix_waitKey

fpierfed · Jan 10, 2017 · b345c6e · b345c6e
2 parents c0cde75 + d015b55
commit b345c6e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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,