[libcalamaresui] Avoid deadlock
- When loading QML V2, both loadQmlV2Complete() and changeSlideShowState()
lock the same mutex, introduced in e7f4479df1
.
- Explicitly unlock when loading is done and we need to change the state
immediately.
This commit is contained in:
parent
376cb3c042
commit
39b5dd4e6e
@ -125,7 +125,11 @@ SlideshowQML::loadQmlV2Complete()
|
|||||||
if ( isActive() )
|
if ( isActive() )
|
||||||
{
|
{
|
||||||
// We're alreay visible! Must have been slow QML loading, and we
|
// We're alreay visible! Must have been slow QML loading, and we
|
||||||
// passed onActivate already.
|
// passed onActivate already. changeSlideShowState() locks
|
||||||
|
// the same mutex: we could set up a workaround to call
|
||||||
|
// changeSlideShowState() later after destruction of l.
|
||||||
|
//
|
||||||
|
l.unlock();
|
||||||
changeSlideShowState( Slideshow::Start );
|
changeSlideShowState( Slideshow::Start );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user