File tree 2 files changed +18
-16
lines changed
2 files changed +18
-16
lines changed Original file line number Diff line number Diff line change @@ -66,6 +66,22 @@ override protected void CreateDisplayObject()
66
66
67
67
override public void Dispose ( )
68
68
{
69
+
70
+ #if FAIRYGUI_TOLUA
71
+ if ( _peerTable != null )
72
+ {
73
+ _peerTable . Dispose ( ) ;
74
+ _peerTable = null ;
75
+ }
76
+ #endif
77
+
78
+ #if FAIRYGUI_PUERTS
79
+ if ( __onDispose != null )
80
+ __onDispose ( ) ;
81
+ __onConstruct = null ;
82
+ __onDispose = null ;
83
+ #endif
84
+
69
85
int cnt = _transitions . Count ;
70
86
for ( int i = 0 ; i < cnt ; ++ i )
71
87
{
@@ -83,8 +99,6 @@ override public void Dispose()
83
99
if ( scrollPane != null )
84
100
scrollPane . Dispose ( ) ;
85
101
86
- base . Dispose ( ) ; //Dispose native tree first, avoid DisplayObject.RemoveFromParent call
87
-
88
102
cnt = _children . Count ;
89
103
for ( int i = cnt - 1 ; i >= 0 ; -- i )
90
104
{
@@ -93,20 +107,7 @@ override public void Dispose()
93
107
obj . Dispose ( ) ;
94
108
}
95
109
96
- #if FAIRYGUI_TOLUA
97
- if ( _peerTable != null )
98
- {
99
- _peerTable . Dispose ( ) ;
100
- _peerTable = null ;
101
- }
102
- #endif
103
-
104
- #if FAIRYGUI_PUERTS
105
- if ( __onDispose != null )
106
- __onDispose ( ) ;
107
- __onConstruct = null ;
108
- __onDispose = null ;
109
- #endif
110
+ base . Dispose ( ) ; //Dispose native tree first, avoid DisplayObject.RemoveFromParent call
110
111
}
111
112
112
113
/// <summary>
Original file line number Diff line number Diff line change @@ -100,6 +100,7 @@ public void SetNativeObject(DisplayObject obj)
100
100
_shape = null ;
101
101
}
102
102
103
+ if ( displayObject != null ) displayObject . Dispose ( ) ;
103
104
displayObject = obj ;
104
105
105
106
if ( displayObject != null )
You can’t perform that action at this time.
0 commit comments