Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 17:55:19 +03:00
Code Issues Wiki Activity

Merge pull request #509 from opentx/bsongis/Companion_crash_190

Browse source 
Fixes #190
This commit is contained in:
Andre Bernet 2014-01-05 04:53:00 -08:00
commit b3f1716f82
1 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

33
companion/src/mainwindow.cpp
View file

@ -1224,34 +1224,29 @@ bool MainWindow::isValidEEPROM(QString eepromfile)
return false; return false;
} }
file.close(); file.close();
RadioData radioData; RadioData * radioData = new RadioData();
if (!LoadEeprom(radioData, eeprom, eeprom_size)) { bool result = LoadEeprom(*radioData, eeprom, eeprom_size);
free(eeprom); free(eeprom);
return false; delete radioData;
} else { return result;
free(eeprom); }
return true; else if (fileType==FILE_TYPE_BIN) { //read binary
}
} else if (fileType==FILE_TYPE_BIN) { //read binary
if (!file.open(QFile::ReadOnly)) if (!file.open(QFile::ReadOnly))
return false; return false;
eeprom_size = file.size(); eeprom_size = file.size();
uint8_t *eeprom = (uint8_t *)malloc(eeprom_size); uint8_t *eeprom = (uint8_t *)malloc(eeprom_size);
memset(eeprom, 0, eeprom_size); memset(eeprom, 0, eeprom_size);
long result = file.read((char*)eeprom, eeprom_size); long read = file.read((char*)eeprom, eeprom_size);
file.close(); file.close();
if (result != eeprom_size) { if (read != eeprom_size) {
free(eeprom); free(eeprom);
return false; return false;
} }
RadioData radioData; RadioData * radioData = new RadioData();
if (!LoadEeprom(radioData, eeprom, eeprom_size)) { bool result = LoadEeprom(*radioData, eeprom, eeprom_size);
free(eeprom); free(eeprom);
return false; delete radioData;
} else { return result;
free(eeprom);
return true;
}
} }
return false; return false;
} }