Tomáš Chvátal 2019-03-15 11:48:40 +00:00 committed by Git OBS Bridge
parent a751fee39a
commit 7c1e7d19de

View File

@ -308,9 +308,9 @@ Index: libreoffice-6.2.2.1/vcl/unx/kde5/KDE5SalInstance.cxx
- } - }
- return new KDE5SalFrame(static_cast<KDE5SalFrame*>(pParent), nState, true); - return new KDE5SalFrame(static_cast<KDE5SalFrame*>(pParent), nState, true);
+ SalFrame* pRet(nullptr); + SalFrame* pRet(nullptr);
+ RunInMainThread(std::function([&pRet, pParent, nState]() { + RunInMainThread([&pRet, pParent, nState]() {
+ pRet = new KDE5SalFrame(static_cast<KDE5SalFrame*>(pParent), nState, true); + pRet = new KDE5SalFrame(static_cast<KDE5SalFrame*>(pParent), nState, true);
+ })); + });
+ assert(pRet); + assert(pRet);
+ return pRet; + return pRet;
} }