From 41d9b7073f8168e2e9b78c1be1beb8e390312a7b Mon Sep 17 00:00:00 2001
From: kkapsner <github@mail.kkapsner.de>
Date: Tue, 14 Nov 2017 01:04:20 +0100
Subject: [PATCH] Wait for settings in the frame script

Fixes #147
---
 lib/frame.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/frame.js b/lib/frame.js
index 11fd61d..9b4dc84 100644
--- a/lib/frame.js
+++ b/lib/frame.js
@@ -141,10 +141,6 @@
 		return true;
 	}
 	
-	settings.onloaded(function(){
-		interceptWindow(window);
-	});
-	
 	message("register listener for messages from background script");
 	browser.runtime.onMessage.addListener(function(data){
 		if (data["canvasBlocker-unload"]){
@@ -162,4 +158,17 @@
 			notice("notifications sent");
 		}
 	});
+	
+	// need to wait for the settings to arrive!
+	while (settings.isStillDefault){
+		logging.message("Starting synchronous request to wait for settings.");
+		let xhr = new XMLHttpRequest();
+		xhr.open("GET", browser.extension.getURL("releaseNotes.txt"), false);
+		xhr.send();
+		logging.message("settings still default?", settings.isStillDefault);
+	}
+
+	settings.onloaded(function(){
+		interceptWindow(window);
+	});
 }());
\ No newline at end of file