OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix crash when removing filter after changing a value

Browse source 
Deleting a filter will trigger a visibility change, which will also
trigger a focus change if the focus has not been on the list itself
(e.g. after interacting with the property view).

When an async filter list is available in the view, it will be the first
candidate to receive focus. If this list is empty, we hide the property
view by default and set the view to a `nullptr`.

When the call for the visibility change returns, we need to check for
this possibility, as another event might have hidden (and deleted) the
view already.
This commit is contained in:
PatTheMav 2022-09-20 00:27:22 +02:00 committed by Ryan Foster
parent 07c4ba7b07
commit 5a16239ed6
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
UI/window-basic-filters.cpp
View file

@ -275,9 +275,25 @@ void OBSBasicFilters::UpdatePropertiesView(int row, bool async)
if (view) {
updatePropertiesSignal.Disconnect();
ui->propertiesFrame->setVisible(false);
view->hide();
view->deleteLater();
view = nullptr;
/* Deleting a filter will trigger a visibility change, which will also
* trigger a focus change if the focus has not been on the list itself
* (e.g. after interacting with the property view).
*
* When an async filter list is available in the view, it will be the first
* candidate to receive focus. If this list is empty, we hide the property
* view by default and set the view to a `nullptr`.
*
* When the call for the visibility change returns, we need to check for
* this possibility, as another event might have hidden (and deleted) the
* view already.
*
* macOS might be especially affected as it doesn't switch keyboard focus
* to buttons like Windows does. */
if (view) {
view->hide();
view->deleteLater();
view = nullptr;
}
}
if (!filter)