Merge pull request #1079 from deXol/develop

limpkin · web-flow · commit 962ba015e3ea · 2022-10-14T23:05:24.000+02:00
Fix Qt6 serial number conversion issue
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -975,7 +975,7 @@ void MainWindow::updateSerialInfos() {
         ui->labelAboutFwVersValue->setVisible(!wsClient->isMPBLE());
         ui->label_UserManual->setText(MANUAL_STRING.arg(wsClient->isMPBLE() ? BLE_MANUAL_URL : MINI_MANUAL_URL));
         ui->label_UserManual->show();
-        if (wsClient->isMPBLE() && serialNum > STARTING_NOT_FLASHED_SERIAL &&
+        if (wsClient->isMPBLE() && wsClient->get_hwSerial() > STARTING_NOT_FLASHED_SERIAL &&
                 wsClient->get_hwSerial() != wsClient->get_platformSerial())
         {
             ui->widgetNotFlashedWarning->show();

Original file line number	Diff line number	Diff line change
`@@ -975,7 +975,7 @@ void MainWindow::updateSerialInfos() {`
`975`	`975`	`ui->labelAboutFwVersValue->setVisible(!wsClient->isMPBLE());`
`976`	`976`	`ui->label_UserManual->setText(MANUAL_STRING.arg(wsClient->isMPBLE() ? BLE_MANUAL_URL : MINI_MANUAL_URL));`
`977`	`977`	`ui->label_UserManual->show();`
`978`		`- if (wsClient->isMPBLE() && serialNum > STARTING_NOT_FLASHED_SERIAL &&`
	`978`	`+ if (wsClient->isMPBLE() && wsClient->get_hwSerial() > STARTING_NOT_FLASHED_SERIAL &&`
`979`	`979`	`wsClient->get_hwSerial() != wsClient->get_platformSerial())`
`980`	`980`	`{`
`981`	`981`	`ui->widgetNotFlashedWarning->show();`