NSUserDefaults: Fetch new value from all domains

gnustep · Oct 24, 2024 · 4143b53 · 4143b53
1 parent ef9781f
commit 4143b53
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m
@@ -1662,8 +1662,14 @@ - (void) setObject: (id)value forKey: (NSString*)defaultName
       old = [self objectForKey: defaultName];
       if ([pd setObject: value forKey: defaultName])
         {
+          id new;
+
+          // New value must be fetched from all domains, as there might be
+          // a registered default if value is nil, or the value is
+          // superseded by GSPrimary or NSArgumentDomain
+          new = [self objectForKey: defaultName];
           [self _changePersistentDomain: processName];
-          [self _notifyObserversOfChangeForKey: defaultName oldValue:old newValue:value];
+          [self _notifyObserversOfChangeForKey: defaultName oldValue:old newValue:new];
         }
       else
         {