From 222627b08da95298ed80a24706d60017742e5615 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 May 2015 22:25:21 +0200
Subject: [PATCH] Clean up caret initialisation.

---
 qutebrowser/browser/webview.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/webview.py b/qutebrowser/browser/webview.py
index b26045c55..b2546d367 100644
--- a/qutebrowser/browser/webview.py
+++ b/qutebrowser/browser/webview.py
@@ -441,12 +441,11 @@ class WebView(QWebView):
             settings.setAttribute(QWebSettings.CaretBrowsingEnabled, True)
             self.selection_enabled = False
 
-            tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                        window=self.win_id)
-            if tabbed_browser.currentWidget().tab_id == self.tab_id:
+            if self.isVisible():
+                # Sometimes the caret isn't immediately visible, but unfocusing
+                # and refocusing it fixes that.
                 self.clearFocus()
                 self.setFocus(Qt.OtherFocusReason)
-
                 self.page().currentFrame().evaluateJavaScript(
                     utils.read_file('javascript/position_caret.js'))