diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-04-15 20:51:27 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-04-15 21:03:44 +0200 |
commit | 90960adf56d4798a23b8fdc7e6a9bb25dd0bf530 (patch) | |
tree | a0d8576d0951d94ef48a3dc81c61652527fbef18 /utils/rbutilqt/base | |
parent | ff08841ea91aad389dea607e39d13e2f61fa65eb (diff) | |
download | rockbox-90960adf56d4798a23b8fdc7e6a9bb25dd0bf530.tar.gz rockbox-90960adf56d4798a23b8fdc7e6a9bb25dd0bf530.zip |
rbutil: Fix bootloader installation for various players.
Reworking handling of player specific data (static player configuration,
as well as information retrieved from the server) changed the behaviour
on a non-present configuration entry. This eventually caused the
mountpoint not being set for players that don't have a bootloader file
on disk. Fixing this accidentially removed the default-if-not-found
handling for the bootloader file.
Restore the old default value behaviour for both cases.
Change-Id: I627782ccdef198619fb507f8b09a64811b3bd18f
Diffstat (limited to 'utils/rbutilqt/base')
-rw-r--r-- | utils/rbutilqt/base/bootloaderinstallbase.cpp | 3 | ||||
-rw-r--r-- | utils/rbutilqt/base/playerbuildinfo.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/utils/rbutilqt/base/bootloaderinstallbase.cpp b/utils/rbutilqt/base/bootloaderinstallbase.cpp index a185b25619..36a15c9e1a 100644 --- a/utils/rbutilqt/base/bootloaderinstallbase.cpp +++ b/utils/rbutilqt/base/bootloaderinstallbase.cpp | |||
@@ -211,6 +211,9 @@ void BootloaderInstallBase::setBlFile(QStringList sl) | |||
211 | m_blfile = sl.at(a); | 211 | m_blfile = sl.at(a); |
212 | } | 212 | } |
213 | } | 213 | } |
214 | if(m_blfile.isEmpty() && sl.size() > 0) { | ||
215 | m_blfile = sl.at(0); | ||
216 | } | ||
214 | } | 217 | } |
215 | 218 | ||
216 | 219 | ||
diff --git a/utils/rbutilqt/base/playerbuildinfo.cpp b/utils/rbutilqt/base/playerbuildinfo.cpp index 195c170f0e..c76abc4ffe 100644 --- a/utils/rbutilqt/base/playerbuildinfo.cpp +++ b/utils/rbutilqt/base/playerbuildinfo.cpp | |||
@@ -261,7 +261,7 @@ QVariant PlayerBuildInfo::value(DeviceInfo item, QString target) | |||
261 | break; | 261 | break; |
262 | 262 | ||
263 | default: | 263 | default: |
264 | result = playerInfo.value(s); | 264 | result = playerInfo.value(s, ""); |
265 | break; | 265 | break; |
266 | } | 266 | } |
267 | 267 | ||