rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed blown assert trying to find neighbor when there was none.

This commit is contained in:
crs 2001-10-23 21:13:08 +00:00
parent cfdf6bd73a
commit b7533aea2a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synergy/CServer.cpp
View File

@ -305,6 +305,7 @@ void CServer::onMouseMoveSecondary(SInt32 dx, SInt32 dy)
m_y = y; m_y = y;
} }
else { else {
log((CLOG_DEBUG "no neighbor; clamping"));
if (m_x < 0) if (m_x < 0)
m_x = 0; m_x = 0;
else if (m_x > m_active->m_width - 1) else if (m_x > m_active->m_width - 1)
@ -446,8 +447,8 @@ CServer::CScreenInfo* CServer::getNeighbor(CScreenInfo* src,
assert(src != NULL); assert(src != NULL);
// get the first neighbor // get the first neighbor
CScreenInfo* lastGoodScreen = src;
CScreenInfo* dst = getNeighbor(src, srcSide); CScreenInfo* dst = getNeighbor(src, srcSide);
CScreenInfo* lastGoodScreen = dst;
// get the source screen's size (needed for kRight and kBottom) // get the source screen's size (needed for kRight and kBottom)
SInt32 w = src->m_width, h = src->m_height; SInt32 w = src->m_width, h = src->m_height;
@ -510,12 +511,16 @@ CServer::CScreenInfo* CServer::getNeighbor(CScreenInfo* src,
} }
break; break;
} }
assert(lastGoodScreen != NULL);
// no neighbor if best neighbor is the source itself
if (lastGoodScreen == src)
return NULL;
// if entering primary screen then be sure to move in far enough // if entering primary screen then be sure to move in far enough
// to avoid the jump zone. if entering a side that doesn't have // to avoid the jump zone. if entering a side that doesn't have
// a neighbor (i.e. an asymmetrical side) then we don't need to // a neighbor (i.e. an asymmetrical side) then we don't need to
// move inwards because that side can't provoke a jump. // move inwards because that side can't provoke a jump.
assert(lastGoodScreen != NULL);
if (lastGoodScreen->m_protocol == NULL) { if (lastGoodScreen->m_protocol == NULL) {
const CString dstName(lastGoodScreen->m_name); const CString dstName(lastGoodScreen->m_name);
switch (srcSide) { switch (srcSide) {