From 026aa5bbb7244fc2cb928eef84aa8eb552302b01 Mon Sep 17 00:00:00 2001
From: vit9696 <vit9696@users.noreply.github.com>
Date: Sun, 13 Dec 2020 18:42:01 +0300
Subject: [PATCH] Fixed quirks enabling per controller

---
 Changelog.md                      | 3 +++
 NVMeFix.xcodeproj/project.pbxproj | 2 +-
 NVMeFix/NVMeFixPlugin.hpp         | 2 +-
 NVMeFix/nvme_quirks.cpp           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e525298..f65bbc4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,8 @@
 NVMeFix Changelog
 =================
+#### v1.0.5
+- Fixed quirks enabling per controller
+
 #### v1.0.4
 - Added MacKernelSDK with Xcode 12 compatibility
 
diff --git a/NVMeFix.xcodeproj/project.pbxproj b/NVMeFix.xcodeproj/project.pbxproj
index 6eca096..c10ded2 100644
--- a/NVMeFix.xcodeproj/project.pbxproj
+++ b/NVMeFix.xcodeproj/project.pbxproj
@@ -221,7 +221,7 @@
 		2FF3E70623AE1DA100D8CDEB /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = acidanthera;
 				TargetAttributes = {
 					2FF3E70E23AE1DA100D8CDEB = {
diff --git a/NVMeFix/NVMeFixPlugin.hpp b/NVMeFix/NVMeFixPlugin.hpp
index 788bc1e..1b950a5 100644
--- a/NVMeFix/NVMeFixPlugin.hpp
+++ b/NVMeFix/NVMeFixPlugin.hpp
@@ -45,7 +45,7 @@ class NVMeFixPlugin {
 	static bool terminatedNotificationHandler(void*, void*, IOService*, IONotifier*);
 	bool solveSymbols(KernelPatcher& kp);
 
-	atomic_bool solvedSymbols;
+	atomic_bool solvedSymbols = false;
 
 	IONotifier* matchingNotifier {nullptr}, * terminationNotifier {nullptr};
 
diff --git a/NVMeFix/nvme_quirks.cpp b/NVMeFix/nvme_quirks.cpp
index 247fb68..1edd80f 100644
--- a/NVMeFix/nvme_quirks.cpp
+++ b/NVMeFix/nvme_quirks.cpp
@@ -322,7 +322,7 @@ nvme_quirks quirksForController(uint16_t vid, const char* mn, const char* fr) {
 	unsigned ret {NVME_QUIRK_NONE};
 
 	for (const auto& entry : core_quirks) {
-		auto match {false};
+		auto match {true};
 		match &= !entry.vid || entry.vid == vid;
 		match &= !entry.mn || !strcmp(entry.mn, mn);
 		match &= !entry.fr || !strcmp(entry.fr, fr);