brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TESTING: Give up on our own context mutex

Browse source
This commit is contained in:
falkTX 2021-10-29 11:00:50 +01:00
parent 7d5cfe997d
commit f34b820000
4 changed files with 15 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/CardinalUI.cpp
View file

@ -68,19 +68,16 @@ class CardinalUI : public UI,
struct ScopedContext {
CardinalPluginContext* const context;
const MutexLocker cml;
ScopedContext(CardinalUI* const ui)
: context(ui->fContext),
cml(context->mutex)
: context(ui->fContext)
{
rack::contextSet(context);
WindowParametersRestore(context->window);
}
ScopedContext(CardinalUI* const ui, const int mods)
: context(ui->fContext),
cml(context->mutex)
: context(ui->fContext)
{
rack::contextSet(context);
rack::window::WindowMods(context->window, mods);
@ -112,23 +109,20 @@ public:
rack::window::Window* const window = new rack::window::Window;
rack::window::WindowInit(window, this);
{
const MutexLocker cml(fContext->mutex);
rack::contextSet(fContext);
rack::contextSet(fContext);
fContext->scene->removeChild(fContext->scene->menuBar);
fContext->scene->menuBar = rack::app::createMenuBar(getWindow(), getApp().isStandalone());
fContext->scene->addChildBelow(fContext->scene->menuBar, fContext->scene->rackScroll);
fContext->scene->removeChild(fContext->scene->menuBar);
fContext->scene->menuBar = rack::app::createMenuBar(getWindow(), getApp().isStandalone());
fContext->scene->addChildBelow(fContext->scene->menuBar, fContext->scene->rackScroll);
fContext->window = window;
fContext->window = window;
rack::widget::Widget::ContextCreateEvent e;
fContext->scene->onContextCreate(e);
rack::widget::Widget::ContextCreateEvent e;
fContext->scene->onContextCreate(e);
window->step();
window->step();
rack::contextSet(nullptr);
}
rack::contextSet(nullptr);
WindowParametersSetCallback(window, this);
}