瀏覽代碼

Merge pull request #610 from jitsi/callstats_fix

Leaves the call when the hangup button is pressed
master
yanas 9 年之前
父節點
當前提交
6bfb28f63f
共有 1 個檔案被更改,包括 7 行新增8 行删除
  1. 7
    8
      conference.js

+ 7
- 8
conference.js 查看文件

126
  * @param {boolean} [requestFeedback=false] if user feedback should be requested
126
  * @param {boolean} [requestFeedback=false] if user feedback should be requested
127
  */
127
  */
128
 function hangup (requestFeedback = false) {
128
 function hangup (requestFeedback = false) {
129
-    let promise = Promise.resolve();
130
-
131
-    if (requestFeedback) {
132
-        promise = APP.UI.requestFeedback();
133
-    }
134
-
135
-    promise.then(function () {
129
+    APP.conference._room.leave().then(() => {
136
         connection.disconnect();
130
         connection.disconnect();
137
-
131
+        if (requestFeedback) {
132
+            return APP.UI.requestFeedback();
133
+        } else {
134
+            return Promise.resolve();
135
+        }
136
+    }).then(function () {
138
         if (!config.enableWelcomePage) {
137
         if (!config.enableWelcomePage) {
139
             return;
138
             return;
140
         }
139
         }

Loading…
取消
儲存