Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix slide position overriding when it shouldn't (#1023)

Browse Source 
* Fix slide position overriding when it shouldn't

* Cover all positions instead
This commit is contained in:
Leifa 2024-07-19 13:20:21 +02:00 committed by GitHub
parent 640b026534
commit 4129c1ffda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/path_functions.cpp
View File

@ -82,18 +82,14 @@ BackgroundPosition AOApplication::get_pos_path(const QString &pos)
{
// witness is default if pos is invalid
QString f_pos = pos;
// legacy overrides for new format if found
if (pos == "def" && file_exists(get_image_suffix(get_background_path("court"))))
if (file_exists(get_image_suffix(get_background_path("court"))))
{
f_pos = "court:def";
}
else if (pos == "pro" && file_exists(get_image_suffix(get_background_path("court"))))
{
f_pos = "court:pro";
}
else if (pos == "wit" && file_exists(get_image_suffix(get_background_path("court"))))
{
f_pos = "court:wit";
if (!read_design_ini("court:" + f_pos + "/origin", get_background_path("design.ini")).isEmpty())
{
f_pos = QString("court:%1").arg(f_pos);
}
}
QStringList f_pos_split = f_pos.split(":");