@@ -127,7 +127,7 @@ private void HandlePropertyChanged(object sender, PropertyChangedEventArgs e)
127127 if ( ( e . PropertyName == "Parent" ) || ( e . PropertyName == null ) ) {
128128 // All properties might have changed -> update everything
129129 cachedOptions = CreateCachedOptions ( ) ;
130- OnPropertyChanged ( e . PropertyName ) ;
130+ // OnPropertyChanged(e.PropertyName);
131131 } else {
132132 // Some other property has changed, check if we have our own value for it
133133 if ( ! activeOptions . Contains ( e . PropertyName ) ) {
@@ -136,7 +136,7 @@ private void HandlePropertyChanged(object sender, PropertyChangedEventArgs e)
136136 if ( propertyInfo != null ) {
137137 var val = GetEffectiveOption ( e . PropertyName ) ;
138138 propertyInfo . SetValue ( cachedOptions , val ) ;
139- OnPropertyChanged ( e . PropertyName ) ;
139+ // OnPropertyChanged(e.PropertyName);
140140 }
141141 }
142142 }
@@ -265,14 +265,16 @@ public void Load(Properties parentProperties)
265265 if ( parentProperties == null )
266266 throw new ArgumentNullException ( "parentProperties" ) ;
267267
268- Properties formatProperties = parentProperties . NestedProperties ( "CSharpFormatting" ) ;
269- if ( formatProperties != null ) {
270- foreach ( var key in formatProperties . Keys ) {
271- try {
272- object val = formatProperties . Get ( key , ( object ) null ) ;
273- SetOption ( key , val ) ;
274- } catch ( Exception ) {
275- // Silently ignore loading error, then this property will be "as parent" automatically
268+ if ( parentProperties . Contains ( "CSharpFormatting" ) ) {
269+ Properties formatProperties = parentProperties . NestedProperties ( "CSharpFormatting" ) ;
270+ if ( formatProperties != null ) {
271+ foreach ( var key in formatProperties . Keys ) {
272+ try {
273+ object val = formatProperties . Get ( key , ( object ) null ) ;
274+ SetOption ( key , val ) ;
275+ } catch ( Exception ) {
276+ // Silently ignore loading error, then this property will be "as parent" automatically
277+ }
276278 }
277279 }
278280 }
0 commit comments