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

14
src/CardinalPlugin.cpp
View file

@ -261,7 +261,6 @@ struct Initializer
std::vector<uint8_t> data(size);
std::memcpy(data.data(), blob, size);
const MutexLocker cml(context->mutex);
rack::contextSet(context);
rack::system::removeRecursively(context->patch->autosavePath);
rack::system::createDirectories(context->patch->autosavePath);
@ -287,10 +286,7 @@ struct Initializer
// -----------------------------------------------------------------------------------------------------------
struct ScopedContext {
const MutexLocker cml;
ScopedContext(const CardinalBasePlugin* const plugin)
: cml(plugin->context->mutex)
{
rack::contextSet(plugin->context);
}
@ -400,15 +396,11 @@ public:
fInitializer->oscPlugin = nullptr;
#endif
{
const MutexLocker cml(context->mutex);
rack::contextSet(context);
rack::contextSet(context);
#if defined(__MOD_DEVICES__) && !defined(HEADLESS)
delete context->window;
context->window = nullptr;
delete context->window;
context->window = nullptr;
#endif
}
delete context;
rack::contextSet(nullptr);