Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-02 03:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Running window calls in the main thread seems to fix dead-lock issues.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-11-17 02:34:05 -03:00
parent 103ec3a894
commit 6d2bcc8dd6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/ecode/ecode.cpp
View File

@@ -3709,15 +3709,13 @@ void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDe
mUISceneNode->runOnMainThread( [path, initialPosition, this] {
loadFileFromPathOrFocus( path, true, nullptr,
getForcePositionFn( initialPosition ) );
} );
if ( !mWindow->hasFocus() ) {
if ( mWindow->isMinimized() ) {
// FIXME: SDL2 seems to very rarely dead-lock on SDL_RestoreWindow call.
// This can create a dead-lock for the file system listener.
mThreadPool->run( [this] { mWindow->restore(); } );
if ( !mWindow->hasFocus() ) {
if ( mWindow->isMinimized() )
mWindow->restore();
mWindow->raise();
}
mWindow->raise();
}
} );
}
FileSystem::fileRemove( fi.getFilepath() );
} );

6
src/tools/ecode/statusbuildoutputcontroller.cpp
View File

@@ -254,8 +254,10 @@ void StatusBuildOutputController::runBuild( const std::string& buildName,
updateBuildButton();
if ( !mApp->getWindow()->hasFocus() )
mApp->getWindow()->flash( WindowFlashOperation::UntilFocused );
if ( !mApp->getWindow()->hasFocus() ) {
mApp->getUISceneNode()->runOnMainThread(
[this] { mApp->getWindow()->flash( WindowFlashOperation::UntilFocused ); } );
}
if ( doneFn )
doneFn( exitCode );