Bug Fix: Unregister observer correctly

Only unregister it if it was actually registered. Signed-off-by: Christopher Snowhill <[email protected]>
losnoco · Feb 27, 2025 · 00d861e · 00d861e
1 parent bfa9660
commit 00d861e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Audio/Chain/ChunkList.h b/Audio/Chain/ChunkList.h
@@ -40,6 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
 #endif
 
 	BOOL halveDSDVolume;
+	BOOL observersAdded;
 
 	void *hdcd_decoder;
 

diff --git a/Audio/Chain/ChunkList.m b/Audio/Chain/ChunkList.m
@@ -402,6 +402,8 @@ - (id)initWithMaximumDuration:(double)duration {
 		halveDSDVolume = NO;
 
 		[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.halveDSDVolume" options:(NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew) context:kChunkListContext];
+
+		observersAdded = YES;
 	}
 
 	return self;
@@ -429,8 +431,10 @@ - (void)dealloc {
 	if(tempData) {
 		free(tempData);
 	}
-
-	[[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:@"values.halveDSDVolume" context:kChunkListContext];
+	if(observersAdded) {
+		[[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:@"values.halveDSDVolume" context:kChunkListContext];
+		observersAdded = NO;
+	}
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,7 @@ NS_ASSUME_NONNULL_BEGIN @@
     #endif
     	BOOL halveDSDVolume;
+    	BOOL observersAdded;
     	void *hdcd_decoder;
@@ Expand Down @@