Fix crash in .publisher() caused by immediately cancelling subscrib…

…er (#66)
sindresorhus · Apr 18, 2021 · 6158b9b · 6158b9b
1 parent 63dcea3
commit 6158b9b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Sources/Defaults/Observation+Combine.swift b/Sources/Defaults/Observation+Combine.swift
@@ -27,7 +27,6 @@ extension Defaults {
 		}
 
 		func cancel() {
-			observation?.invalidate()
 			observation = nil
 			subscriber = nil
 		}

diff --git a/Tests/DefaultsTests/DefaultsTests.swift b/Tests/DefaultsTests/DefaultsTests.swift
@@ -925,4 +925,20 @@ final class DefaultsTests: XCTestCase {
 
 		waitForExpectations(timeout: 10)
 	}
+
+	@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, iOSApplicationExtension 13.0, macOSApplicationExtension 10.15, tvOSApplicationExtension 13.0, watchOSApplicationExtension 6.0, *)
+	func testImmediatelyFinishingPublisherCombine() {
+		let key = Defaults.Key<Bool>("observeKey", default: false)
+		let expect = expectation(description: "Observation closure being called without crashing")
+
+		let cancellable = Defaults
+			.publisher(key, options: [.initial])
+			.first()
+			.sink { _ in
+				expect.fulfill()
+			}
+
+		cancellable.cancel()
+		waitForExpectations(timeout: 10)
+	}
 }