diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-04-24 17:44:54 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-05-15 10:13:40 +0200 |
| commit | a55ea353a56f1fae6c216cc87674de8a269648ea (patch) | |
| tree | df0d5a0ec3f5ef335fbda1263482eb7eafb4a9e5 /cui | |
| parent | d0e59893b57fc77a2376c86ada675b67839d6500 (diff) | |
tdf#113377 cui personalization: fix calling into VCL without necessary locking
We assume the SolarMutex is always taken when doing GL calls, but
putting DBG_TESTSOLARMUTEX() into WinOpenGLContext::makeCurrent()
pointed out two places in the persona code where this invariant wasn't
hold, fix those.
Opening the dialog and downloading previews of one category, then
clicking on an other button to download previews of an other category no
longer results in a crash while calling glBindFramebuffer() with this.
(cherry picked from commit 336d91a6f2bc12ff0342f984cdbb2cf64abd0b56)
Change-Id: Ib8148a709f89c2dc44da102e2023cc61ba890744
Reviewed-on: https://gerrit.libreoffice.org/53434
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 980e19ddddaf46dae68c800d55582e8f6b2c7fdd)
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/personalization.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 9b3e482b55d2..a9ff29edf078 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -252,6 +252,8 @@ void SelectPersonaDialog::AddPersonaSetting( OUString const & rPersonaSetting ) void SelectPersonaDialog::ClearSearchResults() { + // for VCL to be able to destroy bitmaps + SolarMutexGuard aGuard; m_vPersonaSettings.clear(); m_aSelectedPersona.clear(); for(VclPtr<PushButton> & nIndex : m_vResultList) @@ -770,14 +772,14 @@ void SearchAndParseThread::execute() continue; } INetURLObject aURLObj( sPreviewFile ); + // for VCL to be able to create bitmaps / do visual changes in the thread + SolarMutexGuard aGuard; aFilter.ImportGraphic( aGraphic, aURLObj ); Bitmap aBmp = aGraphic.GetBitmap(); if( !m_bExecute ) return; - // for VCL to be able to do visual changes in the thread - SolarMutexGuard aGuard; m_pPersonaDialog->SetImages( Image( aBmp ), nIndex++ ); m_pPersonaDialog->setOptimalLayoutSize(); m_pPersonaDialog->AddPersonaSetting( aPersonaSetting ); |