diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-14 16:23:56 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-14 16:42:29 +0100 |
commit | 2509def164ee7f4aecbe6a786df57140f19e35f2 (patch) | |
tree | 63a7396e1b94482f9f05c3f3abf6c7cd77e10d26 /rbutil/rbutilqt/base/utils.cpp | |
parent | 440083af872da43c116c5374d8e1511cef65abf2 (diff) | |
download | rockbox-2509def164ee7f4aecbe6a786df57140f19e35f2.tar.gz rockbox-2509def164ee7f4aecbe6a786df57140f19e35f2.zip |
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
Diffstat (limited to 'rbutil/rbutilqt/base/utils.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
381 | RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString()); | 381 | RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString()); |
382 | QString installed = rbinfo.target(); | 382 | QString installed = rbinfo.target(); |
383 | if(!installed.isEmpty() && installed != | 383 | if(!installed.isEmpty() && installed != |
384 | SystemInfo::value(SystemInfo::CurConfigureModel).toString()) | 384 | SystemInfo::platformValue(SystemInfo::CurConfigureModel).toString()) |
385 | { | 385 | { |
386 | text += tr("<li>Target mismatch detected.<br/>" | 386 | text += tr("<li>Target mismatch detected.<br/>" |
387 | "Installed target: %1<br/>Selected target: %2.</li>") | 387 | "Installed target: %1<br/>Selected target: %2.</li>") |
388 | .arg(SystemInfo::platformValue(installed, SystemInfo::CurPlatformName).toString(), | 388 | .arg(SystemInfo::platformValue(SystemInfo::CurPlatformName, installed).toString(), |
389 | SystemInfo::value(SystemInfo::CurPlatformName).toString()); | 389 | SystemInfo::platformValue(SystemInfo::CurPlatformName).toString()); |
390 | } | 390 | } |
391 | 391 | ||
392 | if(!text.isEmpty()) | 392 | if(!text.isEmpty()) |