File tree Expand file tree Collapse file tree 3 files changed +13
-9
lines changed
Intersect.Client.Framework/Gwen/Control Expand file tree Collapse file tree 3 files changed +13
-9
lines changed Original file line number Diff line number Diff line change @@ -766,9 +766,13 @@ public virtual void Dispose()
766766 Animation . Cancel ( this ) ;
767767
768768 // [Fix]: "InvalidOperationException: Collection was modified (during iteration); enumeration operation may not execute".
769- // (Creates a copy of the children list to avoid modifying the collection during iteration).
770- var childrenCopy = new List < Base > ( mChildren ) ;
771- childrenCopy . ForEach ( child => child . Dispose ( ) ) ;
769+ // (Creates an array copy of the children to avoid modifying the collection during iteration).
770+ var children = mChildren . ToArray ( ) ;
771+ foreach ( var child in children )
772+ {
773+ child . Dispose ( ) ;
774+ }
775+
772776 mChildren ? . Clear ( ) ;
773777
774778 mInnerPanel ? . Dispose ( ) ;
Original file line number Diff line number Diff line change @@ -135,13 +135,13 @@ public static void OnKeyPressed(Keys modifier, Keys key)
135135 {
136136 var simplifiedEscapeMenuSetting = Globals . Database . SimplifiedEscapeMenu ;
137137
138- if ( ! simplifiedEscapeMenuSetting )
138+ if ( simplifiedEscapeMenuSetting )
139139 {
140- Interface . Interface . GameUi ? . EscapeMenu ? . ToggleHidden ( ) ;
140+ Interface . Interface . GameUi ? . SimplifiedEscapeMenu ? . ToggleHidden ( ) ;
141141 }
142142 else
143143 {
144- Interface . Interface . GameUi ? . SimplifiedEscapeMenu ? . ToggleHidden ( ) ;
144+ Interface . Interface . GameUi ? . EscapeMenu ? . ToggleHidden ( ) ;
145145 }
146146 }
147147 }
Original file line number Diff line number Diff line change @@ -359,13 +359,13 @@ private static void MenuButtonClicked(Base sender, ClickedEventArgs arguments)
359359 {
360360 var simplifiedEscapeMenuSetting = Globals . Database . SimplifiedEscapeMenu ;
361361
362- if ( ! simplifiedEscapeMenuSetting )
362+ if ( simplifiedEscapeMenuSetting )
363363 {
364- Interface . GameUi ? . EscapeMenu ? . ToggleHidden ( ) ;
364+ Interface . GameUi ? . SimplifiedEscapeMenu ? . ToggleHidden ( ) ;
365365 }
366366 else
367367 {
368- Interface . GameUi ? . SimplifiedEscapeMenu ? . ToggleHidden ( ) ;
368+ Interface . GameUi ? . EscapeMenu ? . ToggleHidden ( ) ;
369369 }
370370 }
371371
You can’t perform that action at this time.
0 commit comments