From c0e612531d3ae22f6a6f6d462f4222defe8faa97 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 3 Aug 2014 17:37:24 +0200 Subject: [PATCH] Re #1567: writeBackup(): added PID to temporary file name --- companion/src/mainwindow.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index d5341dc33..a50a01152 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -1172,12 +1172,12 @@ void MainWindow::writeBackup() } int oldrev = getEpromVersion(fileName); QString tempDir = QDir::tempPath(); - QString tempFlash = tempDir + "/flash.bin"; + QString tempFlash = tempDir + QString("/flash-%1.bin").arg(QCoreApplication::applicationPid()); if (!readFirmwareFromRadio(tempFlash)) return; - QString restoreFile = tempDir + "/compat.bin"; + QString restoreFile = tempDir + QString("/compat.bin-%1.bin").arg(QCoreApplication::applicationPid()); if (!convertEEPROM(fileName, restoreFile, tempFlash)) { int ret = QMessageBox::question(this, "Error", tr("Cannot check Models and Settings compatibility! Continue anyway?") , QMessageBox::Yes | QMessageBox::No); @@ -1194,9 +1194,7 @@ void MainWindow::writeBackup() } fileName = restoreFile; } - QByteArray ba = tempFlash.toLatin1(); - char *name = ba.data(); - unlink(name); + unlink(tempFlash.toAscii()); } else { if (backupEnable) {