History

Merge branch 'master' of github.com:highfidelity/hifi into yellow

Sam Gateau committed 7 years ago

Commit 69bb9ac2 parents 22cd631 334e74126 files · +270 −109Browse files

Showing the changes to interface/src/Application.cpp (1 of 26 files). Show all

Unified · Split

interface/src/Application.cpp+3−1
@@ -2935,8 +2935,10 @@ void Application::initializeGL() { · 2934 unmodified lines
29352935
29362936 #if !defined(DISABLE_QML)
29372937 QStringList chromiumFlags;
2938+ // HACK: re-expose mic and camera to prevent crash on domain-change in chromium's media::FakeAudioInputStream::ReadAudioFromSource()
29382939 // Bug 21993: disable microphone and camera input
2939− chromiumFlags << "--use-fake-device-for-media-stream";
2940+ //chromiumFlags << "--use-fake-device-for-media-stream";
2941+
29402942 // Disable signed distance field font rendering on ATI/AMD GPUs, due to
29412943 // https://highfidelity.manuscript.com/f/cases/13677/Text-showing-up-white-on-Marketplace-app
29422944 std::string vendor{ (const char*)glGetString(GL_VENDOR) };