From 90960adf56d4798a23b8fdc7e6a9bb25dd0bf530 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Fri, 15 Apr 2022 20:51:27 +0200 Subject: 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 --- utils/rbutilqt/base/bootloaderinstallbase.cpp | 3 +++ utils/rbutilqt/base/playerbuildinfo.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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) m_blfile = sl.at(a); } } + if(m_blfile.isEmpty() && sl.size() > 0) { + m_blfile = sl.at(0); + } } 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) break; default: - result = playerInfo.value(s); + result = playerInfo.value(s, ""); break; } -- cgit v1.2.3