[tor-commits] [tor-browser/tor-browser-60.7.0esr-9.0-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens

[gk@xxxxxxxxxxxxxx]

commit 41b5dac4943dcf65582f2638fe6d1b5c80127c0a
Author: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
Date:   Tue May 28 14:12:49 2019 +0000

    fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
    
    There are rare situations where getSelectedTab() is null.
---
 mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index 0b369ca8d5ab..265081798bf7 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -3134,7 +3134,10 @@ public class BrowserApp extends GeckoApp
                     // When the content loaded in the background (such as about:tor),
                     // it was loaded while mBrowserChrome was GONE. We should refresh the
                     // height now so the page is rendered correctly.
-                    Tabs.getInstance().getSelectedTab().doReload(true);
+                    Tab selectedTab = Tabs.getInstance().getSelectedTab();
+                    if (selectedTab != null) {
+                        selectedTab.doReload(true);
+                    }
 
                     // If we finished, then Tor bootstrapped 100%
                     mTorNeedsStart = false;

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits