jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Avoid ternary operator for mixed types

master
Richard Stanway 2019-06-27 00:32:50 +02:00
parent cff0d6800f
commit 183cc920c8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UI/source-tree.cpp
View File

@ -1078,8 +1078,12 @@ void SourceTree::dropEvent(QDropEvent *event)
/* if dropping a group, detect if it's */
/* below another group */
obs_sceneitem_t *itemBelow =
row == stm->items.count() ? nullptr : stm->items[row];
obs_sceneitem_t *itemBelow;
if (row == stm->items.count())
itemBelow = nullptr;
else
itemBelow = stm->items[row];
if (hasGroups) {
if (!itemBelow ||
obs_sceneitem_get_group(scene, itemBelow) != dropGroup) {
@ -1288,7 +1292,11 @@ void SourceTree::mouseMoveEvent(QMouseEvent *event)
SourceTreeItem *item = qobject_cast<SourceTreeItem *>(childAt(pos));
OBSBasicPreview *preview = OBSBasicPreview::Get();
preview->hoveredListItem = !!item ? item->sceneitem : nullptr;
if (item)
preview->hoveredListItem = item->sceneitem;
else
preview->hoveredListItem = nullptr;
QListView::mouseMoveEvent(event);
}