From 2509def164ee7f4aecbe6a786df57140f19e35f2 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 14 Nov 2020 16:23:56 +0100 Subject: rbutil: Rework player configuration. - Split internal configuration into player specific and common parts. Always require passing the player for player specific data instead of implicitly assuming the currently selected one; only use the currently selected one if the player name is explicitly passed as empty. - Similarly adjust handling of server info data; prepare for splitting into build type specific values so the naming becomes cleaner. Change-Id: I894e694f83bd9fe2d22ad46b3f8f7df3e2c68033 --- rbutil/rbutilqt/base/utils.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rbutil/rbutilqt/base/utils.cpp') diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index fe35f0c295..a3a3e98fcc 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp @@ -381,12 +381,12 @@ QString Utils::checkEnvironment(bool permission) RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString()); QString installed = rbinfo.target(); if(!installed.isEmpty() && installed != - SystemInfo::value(SystemInfo::CurConfigureModel).toString()) + SystemInfo::platformValue(SystemInfo::CurConfigureModel).toString()) { text += tr("
  • Target mismatch detected.
    " "Installed target: %1
    Selected target: %2.
    • ") - .arg(SystemInfo::platformValue(installed, SystemInfo::CurPlatformName).toString(), - SystemInfo::value(SystemInfo::CurPlatformName).toString()); + .arg(SystemInfo::platformValue(SystemInfo::CurPlatformName, installed).toString(), + SystemInfo::platformValue(SystemInfo::CurPlatformName).toString()); } if(!text.isEmpty()) -- cgit v1.2.3