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

Merge pull request #1456 from admshao/multiview-click-crash-fix 

UI: Fix a rare multiview crash when clicked
master
Jim 2018-08-28 21:40:24 -07:00 committed by GitHub
parent 4e97b1bb30 4264361469
commit 37f861396e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/window-projector.cpp
View File

@ -695,14 +695,16 @@ void OBSProjector::OBSSourceRemoved(void *data, calldata_t *params)
static int getSourceByPosition(int x, int y, float ratio)
{
QWidget *rec = QApplication::activeWindow();
int pos = -1;
QWidget *rec = QApplication::activeWindow();
if (!rec)
return pos;
int cx = rec->width();
int cy = rec->height();
int minX = 0;
int minY = 0;
int maxX = cx;
int maxY = cy;
int pos = -1;
switch (multiviewLayout) {
case MultiviewLayout::HORIZONTAL_TOP_24_SCENES: