Merge pull request #2492 from cg2121/fix-crash

UI: Fix filter rename crash
This commit is contained in:
Jim authored and GitHub committed 2020-03-13 06:50:06 -07:00
commit b6920a4cef
2 files changed
+7

No files matched your search

+5
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
View File
@@ -74,6 +74,8 @@ private:
int noPreviewMargin;
bool editActive = false;
private slots:
void AddFilter(OBSSource filter);
void RemoveFilter(OBSSource filter);