Merge pull request #3054 from zillatrooper:master

44f24efa · Vadim Pisarevsky · 0428ce47 · f3aa4bdf · 44f24efa
Commit 44f24efa authored Aug 07, 2014 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -401,7 +401,7 @@ static CvTrackbar* icvFindTrackBarByName(const char* name_trackbar, const char*
 {
    QString nameQt(name_trackbar);
-    if (!name_window && global_control_panel) //window name is null and we have a control panel
+    if ((!name_window || !name_window[0]) && global_control_panel) //window name is null and we have a control panel
        layout = global_control_panel->myLayout;
    if (!layout)