diff options
| author | Tamas Zakor <ztamas@inf.u-szeged.hu> | 2019-10-08 14:26:59 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-30 11:22:51 +0100 |
| commit | 693ece0da7d1f277db8a27be00a7e7c01b36f847 (patch) | |
| tree | 68293025eb38ea2bf67fc2ae55c8a8777cc6df4c /chromium | |
| parent | 16b62d02b62cba838f2fb8940e561e6b7ef8d01c (diff) | |
| download | qtwebengine-chromium-693ece0da7d1f277db8a27be00a7e7c01b36f847.tar.gz | |
Fix crash on exit on Windows
This patch causes a crash on exit:
https://chromium-review.googlesource.com/c/chromium/src/+/1625485
Change-Id: I7086975a0264ff302b034dafe28471553d230dd0
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium')
| -rw-r--r-- | chromium/gpu/ipc/service/gpu_channel_manager.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/gpu/ipc/service/gpu_channel_manager.cc b/chromium/gpu/ipc/service/gpu_channel_manager.cc index c70cfbf695a..c100732d71c 100644 --- a/chromium/gpu/ipc/service/gpu_channel_manager.cc +++ b/chromium/gpu/ipc/service/gpu_channel_manager.cc @@ -155,15 +155,15 @@ GpuChannelManager::~GpuChannelManager() { gpu_channels_.clear(); gpu_channels.clear(); - if (default_offscreen_surface_.get()) { - default_offscreen_surface_->Destroy(); - default_offscreen_surface_ = nullptr; - } - // Try to make the context current so that GPU resources can be destroyed // correctly. if (shared_context_state_) shared_context_state_->MakeCurrent(nullptr); + + if (default_offscreen_surface_.get()) { + default_offscreen_surface_->Destroy(); + default_offscreen_surface_ = nullptr; + } } gles2::Outputter* GpuChannelManager::outputter() { |