From 10ac30f7761e7fce50e9d767d4e5890f2a7a1cf4 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Tue, 3 Sep 2019 21:44:02 -0700
Subject: [PATCH] Fix problem with S9 SD card warning incorrectly appearing on
 Welcome

---
 oscar/welcome.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp
index ad1da694..4edcd1be 100644
--- a/oscar/welcome.cpp
+++ b/oscar/welcome.cpp
@@ -44,11 +44,11 @@ void Welcome::refreshPage()
 
     bool noMachines = mlist.isEmpty() && posmachines.isEmpty() && oximachines.isEmpty() && stgmachines.isEmpty();
 
-    bool showCardWarning = !noMachines;
+    bool showCardWarning = noMachines;
 
     // The SDCard warning does not need to be seen anymore for people who DON'T use ResMed S9's.. show first import and only when S9 is present
     for (auto & mach :mlist) {
-        if (mach->series().compare("S9") == 0) showCardWarning = true;
+        if (mach->brand().contains("ResMed") && mach->series().contains("S9")) showCardWarning = true;
     }
 
     ui->S9Warning->setVisible(showCardWarning);