From e11f16ac003a7f3d25652f218211559c6959714a Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Wed, 11 Jul 2018 10:36:19 -0700
Subject: [PATCH] Merge pull request #14709 from brave/fix/tor-bookmarks

Block tab.loadURL in tor tabs until tor is initialized
---
 app/browser/tabs.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/browser/tabs.js b/app/browser/tabs.js
index 4ced028fa5b..d565f1b13c4 100644
--- a/app/browser/tabs.js
+++ b/app/browser/tabs.js
@@ -95,6 +95,18 @@ const getPartitionNumber = (partition) => {
   return Number(partition.split('persist:partition-')[1] || 0)
 }
 
+const shouldWaitForTorLoad = (webContents, appState) => {
+  if (webContents &&
+    webContents.session &&
+    webContents.session.partition === appConfig.tor.partition) {
+    appState = appState || appStore.getState()
+    if (appState.getIn(['tor', 'online']) !== true) {
+      console.log('Blocking page load until Tor tab is initialized')
+      return true
+    }
+  }
+}
+
 /**
  * Obtains the current partition.
  * Warning: This function has global side effects in that it increments the
@@ -905,6 +917,9 @@ const api = {
     action = makeImmutable(action)
     const tabId = action.get('tabId')
     const tab = webContentsCache.getWebContents(tabId)
+    if (shouldWaitForTorLoad(tab)) {
+      return
+    }
     if (tab && !tab.isDestroyed()) {
       const url = normalizeUrl(action.get('url'))
       const currentUrl = tab.getURL()
@@ -944,6 +959,9 @@ const api = {
 
   loadURLInTab: (state, tabId, url) => {
     const tab = webContentsCache.getWebContents(tabId)
+    if (shouldWaitForTorLoad(tab)) {
+      return
+    }
     if (tab && !tab.isDestroyed()) {
       url = normalizeUrl(url)
       tab.loadURL(url)