Merge remote-tracking branch 'origin/dvogonen/rename_companion_485' into next
Conflicts: companion/src/CMakeLists.txt companion/src/main.cpp companion/src/modeledit.cpp companion/src/xsimulatordialog.cpp
This commit is contained in:
@@ -196,7 +196,7 @@ void xsimulatorDialog::onTimerEvent()
|
||||
static unsigned int lcd_counter = 0;
|
||||
|
||||
if (!simulator->timer10ms()) {
|
||||
QMessageBox::critical(this, "companion9x", tr("Firmware %1 error: %2").arg(txInterface->getName()).arg(simulator->getError()));
|
||||
QMessageBox::critical(this, "companion", tr("Firmware %1 error: %2").arg(txInterface->getName()).arg(simulator->getError()));
|
||||
timer->stop();
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user