From 22dde8014c27035e9323da6f6029003bdd92799d Mon Sep 17 00:00:00 2001 From: bsongis Date: Sat, 19 Apr 2014 08:52:18 +0200 Subject: [PATCH] Too early from this one --- companion/src/mdichild.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index b910f6319..cd21dd2f0 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -104,7 +104,7 @@ void MdiChild::qSleep(int ms) void MdiChild::eepromInterfaceChanged() { ui->modelsList->refreshList(); - ui->SimulateTxButton->setEnabled(firmware->getCapability(Simulation)); + ui->SimulateTxButton->setEnabled(GetCurrentFirmware()/*firmware*/->getCapability(Simulation)); updateTitle(); } @@ -182,7 +182,7 @@ void MdiChild::modelEdit() QApplication::setOverrideCursor(Qt::WaitCursor); checkAndInitModel( row ); ModelData &model = radioData.models[row - 1]; - ModelEdit *t = new ModelEdit(this, radioData, (row - 1), firmware); + ModelEdit *t = new ModelEdit(this, radioData, (row - 1), GetCurrentFirmware()/*firmware*/); t->setWindowTitle(tr("Editing model %1: ").arg(row) + model.name); connect(t, SIGNAL(modified()), this, SLOT(setModified())); t->show(); @@ -667,10 +667,10 @@ void MdiChild::print(int model, QString filename) PrintDialog * pd = NULL; if (model>=0 && !filename.isEmpty()) { - pd = new PrintDialog(this, firmware, &radioData.generalSettings, &radioData.models[model], filename); + pd = new PrintDialog(this, GetCurrentFirmware()/*firmware*/, &radioData.generalSettings, &radioData.models[model], filename); } else if (ui->modelsList->currentRow() > 0) { - pd = new PrintDialog(this, firmware, &radioData.generalSettings, &radioData.models[ui->modelsList->currentRow()-1]); + pd = new PrintDialog(this, GetCurrentFirmware()/*firmware*/, &radioData.generalSettings, &radioData.models[ui->modelsList->currentRow()-1]); } if (pd) {