Minor misc. fixes (#4729)

* [Simulator] Remove extraneous format value in microsTimer; Better way to delete SimulatorStartupDialog (in case no event loop starts).

* [Simulator] No helpers dependency for SimulatorStartupDialog.

* [simpgmspace] Rename micros timer function and make externally available.

* [Companion] Fix possible uninitialized value in TreeModel (compiler warning).

* [multi_arm] Fix minor compiler warning (MSVC: "unsafe mix of type 'uint8_t' and type 'bool' in operation").

* [lua] Fix compiler warning ("'data' may be used uninitialized in this function").

* [OpenTxSimulator] Fix analogs array range.

* [Simulator] Auto-start simulator when SimulatorMainWindow is first shown (vs. before it was shown).

* [Simulator] DebugOutput: prevent possible mutex deadlock on buffer overflow (force queued connection for Qt < 5.3).

* [Companion] Display calibration data for Horus joysticks (MOUSE1/MOUSE2)
This commit is contained in:
Max Paperno
2017-04-01 08:13:24 +02:00
committed by Bertrand Songis
parent 9c7c8244f4
commit 5dabe53af4
14 changed files with 35 additions and 27 deletions
+2 -2
View File
@@ -265,7 +265,7 @@ void TreeModel::refresh()
for (unsigned i=0; i<radioData->models.size(); i++) {
ModelData & model = radioData->models[i];
int currentColumn = 0;
TreeItem * current;
TreeItem * current = NULL;
if (IS_HORUS(board)) {
if (!model.isEmpty()) {
TreeItem * categoryItem;
@@ -290,7 +290,7 @@ void TreeModel::refresh()
current->setData(currentColumn++, QString().sprintf("%02d", i + 1));
}
if (!model.isEmpty()) {
if (!model.isEmpty() && current) {
QString modelName;
if (strlen(model.name) > 0)
modelName = model.name;