Bugfix: re-enable UDP reception which was destroyed due to regression…

… in 18.6.20 remove warning "Attribute Qt::AA_EnableHighDpiScaling must be set before QCoreApplication is created" Signed-off-by: Gernot Wirschal <[email protected]>
COVESA · Mar 25, 2021 · 6b336ee · 6b336ee
1 parent 842ab3c
commit 6b336ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -27,13 +27,14 @@
 int main(int argc, char *argv[])
 {
 
-    QApplication a(argc, argv);
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
 
+    QApplication a(argc, argv);
+
     QStringList arguments = a.arguments();
     QDltOptManager *opt = QDltOptManager::getInstance();
     opt->parse(&arguments);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -3469,7 +3469,7 @@ void MainWindow::readyRead()
         for(int num = 0; num < project.ecu->topLevelItemCount (); num++)
         {
             EcuItem *ecuitem = (EcuItem*)project.ecu->topLevelItem(num);
-            if( ecuitem && (ecuitem->socket == sender() || ecuitem->m_serialport == sender() || dltIndexer == sender() ) && ( true == ecuitem->connected ) )
+            if( ecuitem && (ecuitem->socket == sender() || ecuitem->m_serialport == sender() || dltIndexer == sender() ) && ( true == ecuitem->connected || (ecuitem->interfacetype == EcuItem::INTERFACETYPE_UDP ) ) )
             {
                 read(ecuitem);
             }

diff --git a/src/version.h b/src/version.h
@@ -26,8 +26,8 @@
 #define PACKAGE_VERSION_STATE "release"
 #define PACKAGE_MAJOR_VERSION "2"
 #define PACKAGE_MINOR_VERSION "21"
-#define PACKAGE_PATCH_LEVEL "1"
-#define PACKAGE_VERSION "2.21.1"
+#define PACKAGE_PATCH_LEVEL "2"
+#define PACKAGE_VERSION "2.21.2"
 #define PACKAGE_REVISION ""
 #define DLT_SUPPORT_MAIL_ADDRESS "[email protected]"
 #define DLT_SUPPORT_NAME "GENIVI"