Skip to content

Commit e1909f4

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop-8.1-16.11.2016
2 parents 5f325ab + 56e46e6 commit e1909f4

31 files changed

+393
-216
lines changed

‎docs/dictionary/property/urlResponse.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ after an HTTP request.
3030
All HTTP requests cause data to be sent to the server and data to be
3131
returned from the server. The <urlResponse> property allows you to
3232
access any data returned by the HTTP server in the last URL operation,
33-
the urlResonse property returns empty if the operation failed.
33+
the <urlResponse> property returns empty if the operation failed.
3434

3535
The HTTP requests which cause data to be returned by the <urlResponse>
3636
property are <get>, <put>, <delete> and <post>.

‎docs/notes/bugfix-18484.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Prevent mobilePlaySoundOnChannel crash on Android

‎docs/notes/bugfix-18809.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Prevent lock up of PI when not selecting choice from font menu

‎docs/notes/bugfix-18810.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Fix a crash when cutting controls
2+

‎docs/notes/bugfix-18812.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Fix crash when opening cards referencing images on non-open cards
2+

‎docs/notes/bugfix-18823.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix a crash when popping up transient windows

‎docs/notes/bugfix-18824.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Fix a crash when drag-selecting controls
2+

‎docs/notes/bugfix-18863.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Fix encrypt/decrypt operations broken by the OpenSSL 1.1.0 update
2+

‎engine/kernel.gyp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
'../thirdparty/libpng/libpng.gyp:libpng',
2828
'../thirdparty/libz/libz.gyp:libz',
2929

30+
'../prebuilt/libopenssl.gyp:libopenssl_headers',
31+
3032
'engine-common.gyp:encode_version',
3133
'engine-common.gyp:quicktime_stubs',
3234

‎engine/src/card.cpp‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,35 +2819,38 @@ void MCCard::updateselection(MCControl *cptr, const MCRectangle &oldrect,
28192819
if (!cptr -> isselectable()
28202820
&& (!MCselectgrouped || cptr->gettype() != CT_GROUP))
28212821
return;
2822-
MCGroup *gptr = MCObjectCast<MCGroup>(cptr);
28232822

28242823
// MW-2008-12-04: [[ Bug ]] Make sure we honour group-local selectGrouped for
28252824
// select-tool drags
2826-
if (MCselectgrouped && cptr->gettype() == CT_GROUP
2827-
&& gptr->getcontrols() != NULL && gptr->getflag(F_VISIBLE) && !gptr->getflag(F_SELECT_GROUP))
2828-
{
2829-
cptr = gptr->getcontrols();
2830-
2831-
MCRectangle t_group_rect;
2832-
t_group_rect = gptr -> getrect();
2833-
2834-
MCRectangle t_group_oldrect;
2835-
t_group_oldrect = MCU_intersect_rect(oldrect, t_group_rect);
2836-
2837-
MCRectangle t_group_selrect;
2838-
t_group_selrect = MCU_intersect_rect(p_selrect, t_group_rect);
2839-
2840-
do
2825+
if (MCselectgrouped && cptr->gettype() == CT_GROUP)
2826+
{
2827+
MCGroup *gptr = MCObjectCast<MCGroup>(cptr);
2828+
if (gptr->getcontrols() != NULL && gptr->getflag(F_VISIBLE) && !gptr->getflag(F_SELECT_GROUP))
28412829
{
2842-
MCRectangle t_rect;
2843-
t_rect = cptr -> getrect();
2844-
if (MCU_line_intersect_rect(t_group_rect, t_rect))
2845-
updateselection(cptr, t_group_oldrect, t_group_selrect, drect);
2830+
cptr = gptr->getcontrols();
28462831

2847-
cptr = cptr->next();
2832+
2833+
MCRectangle t_group_rect;
2834+
t_group_rect = gptr -> getrect();
2835+
2836+
MCRectangle t_group_oldrect;
2837+
t_group_oldrect = MCU_intersect_rect(oldrect, t_group_rect);
2838+
2839+
MCRectangle t_group_selrect;
2840+
t_group_selrect = MCU_intersect_rect(selrect, t_group_rect);
2841+
2842+
do
2843+
{
2844+
MCRectangle t_rect;
2845+
t_rect = cptr -> getrect();
2846+
if (MCU_line_intersect_rect(t_group_rect, t_rect))
2847+
updateselection(cptr, t_group_oldrect, t_group_selrect, drect);
2848+
2849+
cptr = cptr->next();
2850+
}
2851+
while (cptr != gptr->getcontrols());
28482852
}
2849-
while (cptr != gptr->getcontrols());
2850-
}
2853+
}
28512854
else
28522855
{
28532856
Boolean was, is;

0 commit comments

Comments
 (0)