Merge pull request #1456 from admshao/multiview-click-crash-fix
UI: Fix a rare multiview crash when clickedmaster
commit
37f861396e
|
@ -695,14 +695,16 @@ void OBSProjector::OBSSourceRemoved(void *data, calldata_t *params)
|
||||||
|
|
||||||
static int getSourceByPosition(int x, int y, float ratio)
|
static int getSourceByPosition(int x, int y, float ratio)
|
||||||
{
|
{
|
||||||
|
int pos = -1;
|
||||||
QWidget *rec = QApplication::activeWindow();
|
QWidget *rec = QApplication::activeWindow();
|
||||||
|
if (!rec)
|
||||||
|
return pos;
|
||||||
int cx = rec->width();
|
int cx = rec->width();
|
||||||
int cy = rec->height();
|
int cy = rec->height();
|
||||||
int minX = 0;
|
int minX = 0;
|
||||||
int minY = 0;
|
int minY = 0;
|
||||||
int maxX = cx;
|
int maxX = cx;
|
||||||
int maxY = cy;
|
int maxY = cy;
|
||||||
int pos = -1;
|
|
||||||
|
|
||||||
switch (multiviewLayout) {
|
switch (multiviewLayout) {
|
||||||
case MultiviewLayout::HORIZONTAL_TOP_24_SCENES:
|
case MultiviewLayout::HORIZONTAL_TOP_24_SCENES:
|
||||||
|
|
Loading…
Reference in New Issue