highgui: preserve waitKey -1 return value

d015b55e · Alexander Alekhin · 7dd3723a · d015b55e
Commit d015b55e authored Dec 28, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- 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,