#421: 45b5727: fixed messages filter buttons disappeared

nzbget · Aug 5, 2017 · 8dd11f8 · 8dd11f8
1 parent fdc974d
commit 8dd11f8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/webui/config.js b/webui/config.js
@@ -54,12 +54,14 @@ var Options = (new function($)
 
 	this.update = function()
 	{
-		// RPC-function "config" returns CURRENT configurations settings loaded in NZBGet
-		RPC.call('config', [], function(_options) {
-			_this.options = _options;
-			initCategories();
-			_this.restricted = _this.option('ControlPort') === '***';
-		});
+		// RPC-function "config" returns CURRENT configuration settings loaded in NZBGet
+		RPC.call('config', [], function(_options)
+			{
+				_this.options = _options;
+				initCategories();
+				_this.restricted = _this.option('ControlPort') === '***';
+				RPC.next();
+			});
 
 		// loading config templates and build list of post-processing parameters
 		_this.postParamConfig = [];

diff --git a/webui/index.js b/webui/index.js
@@ -774,7 +774,7 @@ var Refresher = (new function($)
 
 		if (firstLoad)
 		{
-			loadQueue++;
+			loadQueue += 2; // options and configtemplates
 			Options.update();
 		}
 	}

diff --git a/webui/messages.js b/webui/messages.js
@@ -99,12 +99,6 @@ var Messages = (new function($)
 
 	function loaded(newMessages)
 	{
-		if (maxMessages === null)
-		{
-			maxMessages = parseInt(Options.option('LogBufferSize'));
-			initFilterButtons();
-		}
-
 		merge(newMessages);
 		RPC.next();
 	}
@@ -129,6 +123,12 @@ var Messages = (new function($)
 
 	this.redraw = function()
 	{
+		if (maxMessages === null)
+		{
+			maxMessages = parseInt(Options.option('LogBufferSize'));
+			initFilterButtons();
+		}
+
 		var data = [];
 
 		for (var i=0; i < messages.length; i++)