chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

PeekProperties not peeking at prop.txt files (causing wrong icon during loading)

Browse Source
This commit is contained in:
Mark Watkins 2016-03-01 21:51:14 +10:00
parent b4a88ee259
commit a0f512d22e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -206,7 +206,8 @@ QString PRS1Loader::checkDir(const QString & path)
QDir dir(newpath); QDir dir(newpath);
QStringList dirs = dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs); QStringList dirs = dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs);
if (dirs.size() > 0) { if (dirs.size() > 0) {
machpath = dirs[0]; machpath = dir.cleanPath(newpath+"/"+dirs[0]);
} }
} }
@ -356,7 +357,9 @@ MachineInfo PRS1Loader::PeekInfo(const QString & path)
MachineInfo info = newInfo(); MachineInfo info = newInfo();
info.serial = newpath.section("/", -1); info.serial = newpath.section("/", -1);
PeekProperties(info, newpath+"/properties.txt"); if (!PeekProperties(info, newpath+"/properties.txt")) {
PeekProperties(info, newpath+"/PROP.TXT");
}
return info; return info;
} }