mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Clean the callback after executed

Browse source
This commit is contained in:
Cheng Zhao 2014-10-01 15:18:34 +08:00
parent ea28f518d3
commit 09678cc485
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
brightray/browser/media/media_capture_devices_dispatcher.cc
View file

@ -159,7 +159,6 @@ void MediaCaptureDevicesDispatcher::OnAudioStreamStopped(
void MediaCaptureDevicesDispatcher::OnCreatingAudioStream( void MediaCaptureDevicesDispatcher::OnCreatingAudioStream(
int render_process_id, int render_process_id,
int render_view_id) { int render_view_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
} }
} // namespace brightray } // namespace brightray

11
brightray/browser/media/media_stream_devices_controller.cc
View file

@ -189,11 +189,12 @@ void MediaStreamDevicesController::HandleUserMediaRequest() {
screen_id.ToString(), "Screen")); screen_id.ToString(), "Screen"));
} }
callback_.Run( content::MediaResponseCallback cb = callback_;
devices, callback_.Reset();
devices.empty() ? content::MEDIA_DEVICE_INVALID_STATE : cb.Run(devices,
content::MEDIA_DEVICE_OK, devices.empty() ? content::MEDIA_DEVICE_INVALID_STATE :
scoped_ptr<content::MediaStreamUI>()); content::MEDIA_DEVICE_OK,
scoped_ptr<content::MediaStreamUI>());
} }
} // namespace brightray } // namespace brightray