From 144af19ebdaefb8830cbba40b1420e23202b7e8d Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 7 Jan 2016 10:52:28 -0800 Subject: [PATCH] Stop looping on URL fixing --- interface/resources/qml/QmlWebWindow.qml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/interface/resources/qml/QmlWebWindow.qml b/interface/resources/qml/QmlWebWindow.qml index 188351c113..008aaeccc3 100644 --- a/interface/resources/qml/QmlWebWindow.qml +++ b/interface/resources/qml/QmlWebWindow.qml @@ -47,10 +47,20 @@ VrDialog { anchors.fill: parent focus: true + property var originalUrl + property var lastFixupTime: 0 + onUrlChanged: { var currentUrl = url.toString(); var newUrl = urlHandler.fixupUrl(currentUrl).toString(); if (newUrl != currentUrl) { + var now = new Date().valueOf(); + if (url === originalUrl && (now - lastFixupTime < 100)) { + console.warn("URL fixup loop detected") + return; + } + originalUrl = url + lastFixupTime = now url = newUrl; } }