Merge pull request #373 from ilysenkov:bugfix_2440

9b4f2d1b · Andrey Kamaev · OpenCV Buildbot · 33c26a93 · 3c878798 · 9b4f2d1b
Commit 9b4f2d1b authored Jan 30, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Jan 30, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

test_gui.cpp modules/highgui/test/test_gui.cpp +3 -0

No files found.
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -499,7 +499,7 @@ CV_IMPL void cvDestroyWindow(const char* name)
 CV_IMPL void cvDestroyAllWindows()
 {
    if (!guiMainThread)
-        CV_Error( CV_StsNullPtr, "NULL guiReceiver (please create a window)" );
+        return;

    QMetaObject::invokeMethod(guiMainThread,
        "destroyAllWindow",

--- a/modules/highgui/test/test_gui.cpp
+++ b/modules/highgui/test/test_gui.cpp
@@ -58,6 +58,9 @@ void Foo(int /*k*/, void* /*z*/) {}

 void CV_HighGuiOnlyGuiTest::run( int /*start_from */)
 {
+    ts->printf(ts->LOG, "GUI 0\n");
+    cvDestroyAllWindows();
+
    ts->printf(ts->LOG, "GUI 1\n");
    namedWindow("Win");