From 514ade984891ae83c1b6974d0cf4d65178583fb2 Mon Sep 17 00:00:00 2001 From: LoudSnorer Date: Fri, 1 Dec 2023 10:31:04 -0500 Subject: [PATCH] Fix Command Lines renaming Profile. add Detection of non-profile folders in Profiles --- oscar/SleepLib/profiles.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index 9f3b9bee..8b274bd0 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -1149,6 +1149,23 @@ void Scan() Profile *prof = new Profile(npath); //prof->Open(); + // validate user name in profile. + QString dbname = prof->user->userName(); + if (dbname.isEmpty()) { + qWarning() << "Not a Profile " << npath; + delete prof; + continue; // skip over this folder. it is not a profile. + } + QString fname = QFileInfo(fi).fileName(); + if (fname != dbname) { + // this condition currently causes an infinite loop - causes oscar issue. + // one solution is to avoid putting this profile in profiles MAP. + // the other solution is to update userName with its new name. + prof->user->setUserName(fname); + QString message = QString("%1 %2 %3 %4").arg("Changing Profile Name").arg(dbname).arg("==>").arg(fname); + qWarning() << message; + } + profiles[fi.fileName()] = prof; // Migrate any old settings