Merge profile and config files and support custom index file

2015-08-28 21:12:04 -07:00
parent 25a5bc0b89
commit d3e48aa3ae
8 changed files with 111 additions and 121 deletions
--- a/app/client_context.go
+++ b/app/client_context.go
@@ -126,7 +126,7 @@ func (context *clientContext) sendInitialize() error {
 	}
 	writer.Close()

-	prefs, _ := json.Marshal(context.app.preferences)
+	prefs, _ := json.Marshal(context.app.options.Preferences)
 	context.connection.WriteMessage(
 		websocket.TextMessage,
 		append([]byte{SetPreferences}, prefs...),