From 3be1d6014ea61bb704f54b19c276e9454b2b583b Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Tue, 4 Oct 2022 18:12:44 -0700 Subject: [PATCH 1/2] Correct VERSION to 1.4.1-alpha-1. --- oscar/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oscar/VERSION b/oscar/VERSION index dd74bafb..7f1dbdb5 100644 --- a/oscar/VERSION +++ b/oscar/VERSION @@ -1,4 +1,4 @@ // 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. -#define VERSION "1.4.1-alpha" +#define VERSION "1.4.1-alpha-1" From 452e16bf2910fa08cb08a5755027c65b3d58115a Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Wed, 5 Oct 2022 15:06:20 -0400 Subject: [PATCH 2/2] Small change for Ubuntu18.04 compatibility --- oscar/SleepLib/loader_plugins/prisma_loader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prisma_loader.cpp b/oscar/SleepLib/loader_plugins/prisma_loader.cpp index 256fe524..8d9d1547 100644 --- a/oscar/SleepLib/loader_plugins/prisma_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prisma_loader.cpp @@ -558,11 +558,11 @@ int PrismaLoader::Open(const QString & selectedPath) QFile prismaLineTherapyFile(selectedPath + QDir::separator() + PRISMA_LINE_THERAPY_FILE); 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; } if (!prismaLineTherapyFile.open(QIODevice::ReadOnly)) { - qDebug() << "Prisma line therapy file not readable" << prismaLineTherapyFile; + qDebug() << "Prisma line therapy file not readable" << prismaLineTherapyFile.fileName(); return 0; } QByteArray therapyData = prismaLineTherapyFile.readAll();