Patch for null userSettings error

Author: Gary Keeble

js/main.js

@@ -499,6 +499,7 @@ function BlackboxLogViewer() {
         if (graph) {
             graph.destroy();
         }
+
 
         if((flightLog.getSysConfig().loopTime             != null) &&
             (flightLog.getSysConfig().frameIntervalPNum   != null) &&
@@ -697,14 +698,6 @@ function BlackboxLogViewer() {
             graphConfig = GraphConfig.getExampleGraphConfigs(flightLog, ["Motors", "Gyros"]);
         }
     });
-    
-    prefs.get('userSettings', function(item) {
-		if(item) {
-	    			userSettings = item;
-				 } else {
-					 userSettings = null;
-				 }
-    	});
 
     // Workspace save/restore to/from file.
     function saveWorkspaces(file) {
@@ -1078,7 +1071,19 @@ function BlackboxLogViewer() {
 
             keysDialog = new KeysDialog($("#dlgKeysDialog")),
 
-            userSettingsDialog = new UserSettingsDialog($("#dlgUserSettings"), function(newSettings) {
+            userSettingsDialog = new UserSettingsDialog($("#dlgUserSettings"), 
+            function(defaultSettings) { // onLoad
+    
+            prefs.get('userSettings', function(item) {
+                if(item) {
+                            userSettings = item;
+                         } else {
+                             userSettings = defaultSettings;
+                         }
+                });                
+            },
+
+            function(newSettings) { // onSave
 	            userSettings = newSettings;
 
 	            prefs.set('userSettings', newSettings);

js/user_settings_dialog.js

@@ -1,6 +1,6 @@
 'use strict';
 
-function UserSettingsDialog(dialog, onSave) {
+function UserSettingsDialog(dialog, onLoad, onSave) {
 
 	// Private Variables
 
@@ -36,7 +36,7 @@ function UserSettingsDialog(dialog, onSave) {
 
 	// Setup Defaults....
 
-	var currentSettings = {
+	var defaultSettings = {
 		mixerConfiguration : 3, 				// Default to Quad-X
 		customMix 			: null,				// Default to no mixer configuration
 		stickMode 			: 2,				// Default to Mode 2
@@ -48,7 +48,9 @@ function UserSettingsDialog(dialog, onSave) {
 		drawAnalyser		:true,              // add an analyser option
 		analyserSampleRate	:2000/*Hz*/,  		// the loop time for the log
 		eraseBackground		: true           	// Set to false if you want the graph to draw on top of an existing canvas image
-	}
+	};
+
+	var currentSettings = {};
 
     function saveCustomMix() {
 
@@ -199,11 +201,16 @@ function UserSettingsDialog(dialog, onSave) {
         stickModeSelection(parseInt($(this).val()));
     });
 
+	// Initialise the userSettings
+
+	onLoad(defaultSettings);
+
 	// Public variables
+
 
     this.show = function(flightLog, settings) {
 
- 			currentSettings = $.extend(currentSettings, settings || {});
+ 			currentSettings = $.extend(defaultSettings, currentSettings, settings || {});
 
     		getAvailableMotors(flightLog); // Which motors are in the log file ?