Browse Source

Fixes autoEnableDesktopSharing option.

master
damencho 9 years ago
parent
commit
4228537390
1 changed files with 4 additions and 1 deletions
  1. 4
    1
      app.js

+ 4
- 1
app.js View File

75
     var isUIReady = APP.UI.start();
75
     var isUIReady = APP.UI.start();
76
     if (isUIReady) {
76
     if (isUIReady) {
77
         APP.conference.init({roomName: buildRoomName()}).then(function () {
77
         APP.conference.init({roomName: buildRoomName()}).then(function () {
78
+            // init desktop before UI, in order to make sure
79
+            // autoEnableDesktopSharing works
80
+            APP.desktopsharing.init(JitsiMeetJS.isDesktopSharingEnabled());
81
+
78
             APP.UI.initConference();
82
             APP.UI.initConference();
79
 
83
 
80
             APP.UI.addListener(UIEvents.LANG_CHANGED, function (language) {
84
             APP.UI.addListener(UIEvents.LANG_CHANGED, function (language) {
82
                 APP.settings.setLanguage(language);
86
                 APP.settings.setLanguage(language);
83
             });
87
             });
84
 
88
 
85
-            APP.desktopsharing.init(JitsiMeetJS.isDesktopSharingEnabled());
86
             APP.keyboardshortcut.init();
89
             APP.keyboardshortcut.init();
87
         }).catch(function (err) {
90
         }).catch(function (err) {
88
             console.error(err);
91
             console.error(err);

Loading…
Cancel
Save