When mergeOptions is called before a view is created or after it's destroyed, don't attempt to create the view. Fixes #6097
|
|
||
96 |
|
96 |
|
97 |
|
97 |
|
98 |
|
98 |
|
99 |
|
|
|
|
99 |
|
|
100 |
|
100 |
|
101 |
|
101 |
|
102 |
|
102 |
|
|
|
||
326 |
|
326 |
|
327 |
|
327 |
|
328 |
|
328 |
|
329 |
|
|
|
330 |
|
329 |
|
|
330 |
|
|
331 |
|
331 |
|
332 |
|
332 |
|
333 |
|
333 |
|
|
|
||
21 |
|
21 |
|
22 |
|
22 |
|
23 |
|
23 |
|
|
24 |
|
|
24 |
|
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
|
|
||
40 |
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
43 |
|
|
|
|
44 |
|
|
44 |
|
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
|
|
|
49 |
|
|
49 |
|
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
|
|
||
117 |
|
118 |
|
118 |
|
119 |
|
119 |
|
120 |
|
120 |
|
|
|
|
121 |
|
|
121 |
|
122 |
|
|
123 |
|
|
|
124 |
|
|
|
125 |
|
|
|
126 |
|
|
|
127 |
|
|
122 |
|
128 |
|
123 |
|
129 |
|
124 |
|
130 |
|
|
|
||
1 |
|
1 |
|
2 |
|
2 |
|
3 |
|
3 |
|
4 |
|
|
|
5 |
|
4 |
|
6 |
|
5 |
|
7 |
|
6 |
|
|
|
||
27 |
|
26 |
|
28 |
|
27 |
|
29 |
|
28 |
|
|
29 |
|
|
|
30 |
|
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
|
|
||
183 |
|
184 |
|
184 |
|
185 |
|
185 |
|
186 |
|
|
187 |
|
|
|
188 |
|
|
|
189 |
|
|
|
190 |
|
|
|
191 |
|
|
|
192 |
|
|
186 |
|
193 |
|
187 |
|
194 |
|
188 |
|
195 |
|