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

Merge branch 'master' into translations-oct4

Browse Source
This commit is contained in:
ArieKlerk 2022-10-11 19:03:06 +02:00
commit 5d010d653b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar/SleepLib/loader_plugins/prisma_loader.cpp
View File

@ -558,11 +558,11 @@ int PrismaLoader::Open(const QString & selectedPath)
QFile prismaLineTherapyFile(selectedPath + QDir::separator() + PRISMA_LINE_THERAPY_FILE); QFile prismaLineTherapyFile(selectedPath + QDir::separator() + PRISMA_LINE_THERAPY_FILE);
if (!prismaLineTherapyFile.exists()) { // TODO AXT || !configFile.isReadable() fails if (!prismaLineTherapyFile.exists()) { // TODO AXT || !configFile.isReadable() fails
qDebug() << "Prisma line therapy file error" << prismaLineTherapyFile; qDebug() << "Prisma line therapy file error" << prismaLineTherapyFile.fileName();
return 0; return 0;
} }
if (!prismaLineTherapyFile.open(QIODevice::ReadOnly)) { if (!prismaLineTherapyFile.open(QIODevice::ReadOnly)) {
qDebug() << "Prisma line therapy file not readable" << prismaLineTherapyFile; qDebug() << "Prisma line therapy file not readable" << prismaLineTherapyFile.fileName();
return 0; return 0;
} }
QByteArray therapyData = prismaLineTherapyFile.readAll(); QByteArray therapyData = prismaLineTherapyFile.readAll();

2
oscar/VERSION
View File

@ -1,4 +1,4 @@
// Update the string below to set OSCAR's version and release status. // Update the string below to set OSCAR's version and release status.
// See https://semver.org/spec/v2.0.0.html for details on format. // See https://semver.org/spec/v2.0.0.html for details on format.
#define VERSION "1.4.1-alpha" #define VERSION "1.4.1-alpha-1"