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

Re #1567: readEeprom():

Browse source 
* added PID to temporary file name
 * better error message
 * temporary file deletion
This commit is contained in:
Damjan Adamic 2014-08-03 17:27:39 +02:00
parent 12ba27247e
commit 55cb5dce87
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
companion/src/mainwindow.cpp
View file

@ -947,20 +947,23 @@ QString MainWindow::FindMassstoragePath(QString filename)
void MainWindow::readEeprom()
{
QString tempDir = QDir::tempPath();
QString tempFile;
QString tempFile = tempDir + QString("/temp-%1").arg(QCoreApplication::applicationPid());;
EEPROMInterface *eepromInterface = GetEepromInterface();
if (IS_ARM(eepromInterface->getBoard()))
tempFile = tempDir + "/temp.bin";
tempFile += ".bin";
else
tempFile = tempDir + "/temp.hex";
tempFile += ".hex";
qDebug() << "MainWindow::readEeprom(): using temp file: " << tempFile;
if (readEepromFromRadio(tempFile, tr("Read Models and Settings From Radio"))) {
MdiChild *child = createMdiChild();
child->newFile();
child->loadFile(tempFile, false);
child->show();
unlink(tempFile.toAscii());
}
}
@ -1042,7 +1045,10 @@ bool MainWindow::readEepromFromRadio(const QString filename, const QString messa
QFile file(filename);
if (file.exists()) {
file.remove();
if (!file.remove()) {
QMessageBox::warning(this, tr("Error"), tr("Could not delete temporary file: %1").arg(filename));
return false;
}
}
if (IS_ARM(GetCurrentFirmware()->getBoard())) {