From a0f512d22e3dfb5c5b693ccca34816edfc28c1de Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 1 Mar 2016 21:51:14 +1000 Subject: [PATCH] PeekProperties not peeking at prop.txt files (causing wrong icon during loading) --- sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index 56aebb47..c0287e65 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -206,7 +206,8 @@ QString PRS1Loader::checkDir(const QString & path) QDir dir(newpath); QStringList dirs = dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs); 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(); info.serial = newpath.section("/", -1); - PeekProperties(info, newpath+"/properties.txt"); + if (!PeekProperties(info, newpath+"/properties.txt")) { + PeekProperties(info, newpath+"/PROP.TXT"); + } return info; }