Fix a bug that impede to set the trackbar pos using the Qt control panel
authorLuis Díaz Más <piponazo@gmail.com>
Thu, 19 Mar 2015 20:25:10 +0000 (21:25 +0100)
committerLuis Díaz Más <piponazo@gmail.com>
Thu, 19 Mar 2015 20:25:10 +0000 (21:25 +0100)
modules/highgui/src/window_QT.cpp

index b96d7cb..a9cb2c0 100644 (file)
@@ -406,13 +406,14 @@ static CvBar* icvFindBarByName(QBoxLayout* layout, QString name_bar, typeBar typ
 static CvTrackbar* icvFindTrackBarByName(const char* name_trackbar, const char* name_window, QBoxLayout* layout = NULL)
 {
     QString nameQt(name_trackbar);
+    QString nameWinQt(name_window);
 
-    if (!name_window && global_control_panel) //window name is null and we have a control panel
+    if (nameWinQt.isEmpty() && global_control_panel) //window name is null and we have a control panel
         layout = global_control_panel->myLayout;
 
     if (!layout)
     {
-        QPointer<CvWindow> w = icvFindWindowByName(QLatin1String(name_window));
+        QPointer<CvWindow> w = icvFindWindowByName(nameWinQt);
 
         if (!w)
             CV_Error(CV_StsNullPtr, "NULL window handler");