This repository was archived by the owner on Jul 22, 2024. It is now read-only.
File tree 4 files changed +17
-2
lines changed
app/src/common/shared/org/mozilla/vrbrowser/ui/widgets
4 files changed +17
-2
lines changed Original file line number Diff line number Diff line change @@ -374,8 +374,13 @@ public void releaseWidget() {
374
374
}
375
375
376
376
detachFromWindow ();
377
-
378
377
mAttachedWindow = null ;
378
+
379
+ if (mSendTabDialog != null && !mSendTabDialog .isReleased ()) {
380
+ mSendTabDialog .releaseWidget ();
381
+ }
382
+ mSendTabDialog = null ;
383
+
379
384
super .releaseWidget ();
380
385
}
381
386
Original file line number Diff line number Diff line change @@ -159,6 +159,10 @@ public void attachToWindow(WindowWidget aWindow) {
159
159
160
160
@ Override
161
161
public void releaseWidget () {
162
+ if (mSendTabDialog != null && !mSendTabDialog .isReleased ()) {
163
+ mSendTabDialog .releaseWidget ();
164
+ }
165
+ mSendTabDialog = null ;
162
166
super .releaseWidget ();
163
167
}
164
168
Original file line number Diff line number Diff line change @@ -459,6 +459,10 @@ public void onResume() {
459
459
}
460
460
461
461
public void onDestroy () {
462
+ if (mTabsWidget != null && !mTabsWidget .isReleased ()) {
463
+ mTabsWidget .releaseWidget ();
464
+ mTabsWidget = null ;
465
+ }
462
466
mDelegate = null ;
463
467
for (WindowWidget window : mRegularWindows ) {
464
468
window .close ();
Original file line number Diff line number Diff line change @@ -33,7 +33,9 @@ private void initialize() {
33
33
34
34
@ Override
35
35
public void releaseWidget () {
36
- mWidgetManager .removeWorldClickListener (this );
36
+ if (mWidgetManager != null ) {
37
+ mWidgetManager .removeWorldClickListener (this );
38
+ }
37
39
mDialogs .remove (this );
38
40
super .releaseWidget ();
39
41
}
You can’t perform that action at this time.
0 commit comments