mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 21:13:04 +02:00
Code

Merge pull request #2492 from cg2121/fix-crash

Browse Source 
UI: Fix filter rename crash
This commit is contained in:
Jim 2020-03-13 06:50:06 -07:00 committed by GitHub
commit b6920a4cef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UI/window-basic-filters.cpp
View File

@ -738,6 +738,9 @@ void OBSBasicFilters::CustomContextMenu(const QPoint &pos, bool async)
void OBSBasicFilters::EditItem(QListWidgetItem *item, bool async)
{
if (editActive)
return;
Qt::ItemFlags flags = item->flags();
OBSSource filter = item->data(Qt::UserRole).value<OBSSource>();
const char *name = obs_source_get_name(filter);
@ -748,6 +751,7 @@ void OBSBasicFilters::EditItem(QListWidgetItem *item, bool async)
list->removeItemWidget(item);
list->editItem(item);
item->setFlags(flags);
editActive = true;
}
void OBSBasicFilters::on_asyncFilters_customContextMenuRequested(
@ -814,6 +818,7 @@ void OBSBasicFilters::FilterNameEdited(QWidget *editor, QListWidget *list)
listItem->setText(QString());
SetupVisibilityItem(list, listItem, filter);
editActive = false;
}
void OBSBasicFilters::AsyncFilterNameEdited(

2
UI/window-basic-filters.hpp
View File

@ -74,6 +74,8 @@ private:
int noPreviewMargin;
bool editActive = false;
private slots:
void AddFilter(OBSSource filter);
void RemoveFilter(OBSSource filter);