From 61d81459966bb5824fa1990607dea6e0531f534b Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sun, 9 Aug 2020 19:03:10 +0200 Subject: [PATCH] Some minor cleanups, added verbose to the travis build script --- .travis.yml | 2 +- shared/js/ui/modal/ModalSettings.tsx | 1 - shared/js/video-viewer/Controller.ts | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b262ead..05fc6ec4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ stages: jobs: include: - stage: compile - script: "./scripts/travis/build.sh --enable-release --enable-debug || travis_terminate 1;" + script: "./scripts/travis/build.sh --enable-release --enable-debug --verbose || travis_terminate 1;" deploy: - provider: script diff --git a/shared/js/ui/modal/ModalSettings.tsx b/shared/js/ui/modal/ModalSettings.tsx index 48fec1bc..c37caf9d 100644 --- a/shared/js/ui/modal/ModalSettings.tsx +++ b/shared/js/ui/modal/ModalSettings.tsx @@ -1719,7 +1719,6 @@ export namespace modal_settings { const update_level_meter = () => { destroy_meters(); - return; /* FIXME: Remove! */ for(const device of arecorder.devices()) { let promise = arecorder.create_levelmeter(device).then(meter => { meter.set_observer(level => { diff --git a/shared/js/video-viewer/Controller.ts b/shared/js/video-viewer/Controller.ts index 1c11d8c2..65cec9d9 100644 --- a/shared/js/video-viewer/Controller.ts +++ b/shared/js/video-viewer/Controller.ts @@ -347,6 +347,8 @@ global_client_actions.on("action_w2g", event => { } currentVideoViewer.open().catch(error => { + let errorMessage = typeof error === "string" ? error : tr("Lookup the console for details"); + createErrorModal(tr("Failed to open video viewer."), tra("Failed to open the video viewer: {}", errorMessage)).open(); logError(LogCategory.GENERAL, tr("Failed to open video viewer: %o"), error); currentVideoViewer.destroy(); currentVideoViewer = undefined;