repo: janusweb
action: commit
revision: 
path_from: 
revision_from: b7bf7ec9d389944d0632215e079976e5a5b65b99:
path_to: 
revision_to: 

commit b7bf7ec9d389944d0632215e079976e5a5b65b99
Author: James Baicoianu 
Date:   Thu Apr 25 08:47:53 2019 -0700

    Fix for double / in UI config path

diff --git a/scripts/client.js b/scripts/client.js

--- a/scripts/client.js
+++ b/scripts/client.js
@@ -146,7 +146,7 @@ elation.require(['engine.engine', 'engine.assets', 'engine.things.light_ambient'

       this.shownavigation = elation.utils.any(this.args.shownavigation, true);
       var datapath = elation.config.get('janusweb.datapath', '/media/janusweb');
-      this.uiconfig = elation.utils.any(this.player.getSetting('uiconfig'), this.args.uiconfig, datapath + '/assets/webui/default.json');
+      this.uiconfig = elation.utils.any(this.player.getSetting('uiconfig'), this.args.uiconfig, datapath + (datapath[datapath.length-1] != '/' ? '/' : '') + 'assets/webui/default.json');
       if (this.shownavigation) {
         this.ui = elation.elements.create('janus.ui.main', {
           append: this,

-----END OF PAGE-----