eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix Do not lock session in action manager

Browse Source 
This was causing mutex deadlock
This commit is contained in:
Bruno
2021-05-17 16:10:46 +02:00
parent 2a7857c499
commit 2333a7a11a
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ActionManager.cpp
View File

@@ -26,7 +26,6 @@ using namespace tinyxml2;
void captureMixerSession(tinyxml2::XMLDocument *doc, std::string node, std::string label) void captureMixerSession(tinyxml2::XMLDocument *doc, std::string node, std::string label)
{ {
// create node // create node
XMLElement *sessionNode = doc->NewElement( node.c_str() ); XMLElement *sessionNode = doc->NewElement( node.c_str() );
doc->InsertEndChild(sessionNode); doc->InsertEndChild(sessionNode);
@@ -37,7 +36,6 @@ void captureMixerSession(tinyxml2::XMLDocument *doc, std::string node, std::stri
// get session to operate on // get session to operate on
Session *se = Mixer::manager().session(); Session *se = Mixer::manager().session();
se->lock();
// get the thumbnail (requires one opengl update to render) // get the thumbnail (requires one opengl update to render)
FrameBufferImage *thumbnail = se->thumbnail(); FrameBufferImage *thumbnail = se->thumbnail();
@@ -51,7 +49,6 @@ void captureMixerSession(tinyxml2::XMLDocument *doc, std::string node, std::stri
for (auto iter = se->begin(); iter != se->end(); ++iter, sv.setRoot(sessionNode) ) for (auto iter = se->begin(); iter != se->end(); ++iter, sv.setRoot(sessionNode) )
(*iter)->accept(sv); (*iter)->accept(sv);
se->unlock();
} }