Browse Source

Adds an error for user canceling the window choosing window/desktop when sharing desktop.

dev1
damencho 9 years ago
parent
commit
104bf2363b
2 changed files with 15 additions and 0 deletions
  1. 2
    0
      JitsiTrackErrors.js
  2. 13
    0
      modules/RTC/ScreenObtainer.js

+ 2
- 0
JitsiTrackErrors.js View File

@@ -25,5 +25,7 @@ module.exports = {
25 25
     FIREFOX_EXTENSION_NEEDED: "gum.firefox_extension_needed",
26 26
     CHROME_EXTENSION_INSTALLATION_ERROR:
27 27
         "gum.chrome_extension_installation_error",
28
+    CHROME_EXTENSION_USER_CANCELED:
29
+        "gum.chrome_extension_user_canceled",
28 30
     GENERAL: "gum.general"
29 31
 };

+ 13
- 0
modules/RTC/ScreenObtainer.js View File

@@ -357,6 +357,19 @@ function doGetStreamFromExtension(options, streamCallback, failCallback) {
357 357
                     failCallback,
358 358
                     {desktopStream: response.streamId});
359 359
             } else {
360
+                // As noted in Chrome Desktop Capture API:
361
+                // If user didn't select any source (i.e. canceled the prompt)
362
+                // then the callback is called with an empty streamId.
363
+                if(response.streamId === "")
364
+                {
365
+                    failCallback({
366
+                        type: "jitsiError",
367
+                        errorObject:
368
+                            JitsiTrackErrors.CHROME_EXTENSION_USER_CANCELED
369
+                    });
370
+                    return;
371
+                }
372
+
360 373
                 failCallback("Extension failed to get the stream");
361 374
             }
362 375
         }

Loading…
Cancel
Save