diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-04-26 22:01:33 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-04-26 22:01:33 +0200 |
commit | 7f9bb7b823f1fadb56417eb1b1a02b6a7a6aac97 (patch) | |
tree | 02b062b56bb17aedab3ee9e3278c449de9cc67f4 | |
parent | b623b97d4084f1dc0d92da8d932833004e331982 (diff) | |
download | rockbox-7f9bb7b823f1fadb56417eb1b1a02b6a7a6aac97.tar.gz rockbox-7f9bb7b823f1fadb56417eb1b1a02b6a7a6aac97.zip |
MI4 bootloader: check for copy result.
As for BootloaderInstallFile check if copying the bootloader file to the player
did actually work or if an already present file caused the copy operation to
fail.
Change-Id: I2e889610b4cb9f57f73cffc473c6230be0d11e24
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp index b2d8d0c24b..8bce8212a9 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | |||
@@ -58,9 +58,22 @@ void BootloaderInstallMi4::installStage2(void) | |||
58 | 58 | ||
59 | // place new bootloader | 59 | // place new bootloader |
60 | m_tempfile.open(); | 60 | m_tempfile.open(); |
61 | qDebug() << "[BootloaderInstallMi4] renaming" << m_tempfile.fileName() << "to" << fwfile; | 61 | qDebug() << "[BootloaderInstallMi4] renaming" << m_tempfile.fileName() |
62 | << "to" << fwfile; | ||
62 | m_tempfile.close(); | 63 | m_tempfile.close(); |
63 | m_tempfile.copy(fwfile); | 64 | if(!Utils::resolvePathCase(fwfile).isEmpty()) { |
65 | emit logItem(tr("A firmware file is already present on player"), LOGERROR); | ||
66 | emit done(true); | ||
67 | return; | ||
68 | } | ||
69 | if(m_tempfile.copy(fwfile)) { | ||
70 | emit logItem(tr("Bootloader successful installed"), LOGOK); | ||
71 | } | ||
72 | else { | ||
73 | emit logItem(tr("Copying modified firmware file failed"), LOGERROR); | ||
74 | emit done(true); | ||
75 | return; | ||
76 | } | ||
64 | 77 | ||
65 | emit logItem(tr("Bootloader successful installed"), LOGOK); | 78 | emit logItem(tr("Bootloader successful installed"), LOGOK); |
66 | logInstall(LogAdd); | 79 | logInstall(LogAdd); |