Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit ee5cadb

Browse files
author
Monte Goulding
authored
Merge pull request #1785 from montegoulding/bugfix-20535
Bugfix 20535 & 20536
2 parents bf7558c + 3b6a36f commit ee5cadb

3 files changed

Lines changed: 44 additions & 38 deletions

File tree

Toolset/libraries/revidelibrary.8.livecodescript

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8614,45 +8614,49 @@ on revIDEToggle pProperty
86148614
case "Suppress Messages"
86158615
global gRevSuppressMessages
86168616
put "suppressMessages" into tToggleMessage
8617+
8618+
local tLine
86178619
if not gREVSuppressMessages then
86188620
put true into gREVSuppressMessages
86198621
# Send the suppress messages toggle message before actually suppressing messages
86208622
ideMessageSend "ideToggleChanged:" & tToggleMessage
86218623
set the lockCursor to false
8622-
repeat for each line l in the pendingMessages
8623-
if char 1 to 3 of item 2 of l is not "rev" then cancel (item 1 of l)
8624+
repeat for each line tLine in the pendingMessages
8625+
if not revIDEObjectIsOnIDEStack(item 4 to -1 of tLine) then
8626+
cancel (item 1 of tLine)
8627+
end if
86248628
end repeat
8625-
repeat for each line l in the frontScripts
8626-
if char 1 to 3 of the short name of l is not "rev" then
8627-
put l & cr after sRestoreState["front"]
8628-
remove script of l from front
8629+
repeat for each line tLine in the frontScripts
8630+
if not revIDEObjectIsOnIDEStack(tLine) then
8631+
put tLine & cr after sRestoreState["front"]
8632+
remove script of tLine from front
86298633
end if
86308634
end repeat
8631-
repeat for each line l in the backScripts
8632-
if char 1 to 3 of the short name of l is not "rev" then
8633-
put l & cr after sRestoreState["back"]
8634-
remove script of l from back
8635+
repeat for each line tLine in the backScripts
8636+
if not revIDEObjectIsOnIDEStack(tLine) then
8637+
put tLine & cr after sRestoreState["back"]
8638+
remove script of tLine from back
86358639
end if
86368640
end repeat
8637-
repeat for each line l in the stacksInUse
8638-
if char 1 to 3 of l is not "rev" then
8639-
put l & cr after sRestoreState["inUse"]
8640-
stop using stack l
8641+
repeat for each line tLine in the stacksInUse
8642+
if not revIDEObjectIsOnIDEStack(tLine) then
8643+
put tLine & cr after sRestoreState["inUse"]
8644+
stop using stack tLine
86418645
end if
86428646
end repeat
86438647
revInternal__LoadLibrary "revNoMessagesLibrary"
86448648
exit revIDEToggle
86458649
else
86468650
revInternal__UnloadLibrary "revNoMessagesLibrary"
86478651
put false into gREVSuppressMessages
8648-
repeat for each line l in sRestoreState["front"]
8649-
insert script of l into front
8652+
repeat for each line tLine in sRestoreState["front"]
8653+
insert script of tLine into front
86508654
end repeat
8651-
repeat for each line l in sRestoreState["back"]
8652-
insert script of l into back
8655+
repeat for each line tLine in sRestoreState["back"]
8656+
insert script of tLine into back
86538657
end repeat
8654-
repeat for each line l in sRestoreState["inUse"]
8655-
start using stack l
8658+
repeat for each line tLine in sRestoreState["inUse"]
8659+
start using stack tLine
86568660
end repeat
86578661
delete variable sRestoreState
86588662
end if
@@ -9585,36 +9589,36 @@ command revIDESuspendDevelopmentTools
95859589
-- Remove front and back scripts that pertain to the IDE
95869590
-- If the shift-key is down, we remove *all* 'rev' front and back scripts, including
95879591
-- the library scripts.
9588-
local tScriptsList, tRemoveFrontList, tRemoveBackList
9592+
local tScriptsList, tRemoveFrontList, tRemoveBackList, tLine
95899593
select empty
95909594
if the shiftKey is down then
95919595
put the frontScripts into tScriptsList
9592-
repeat for each line l in tScriptsList
9593-
if char 1 to 3 of the short name of l is "rev" then
9594-
put l & cr after tRemoveFrontList
9595-
remove script of l from front
9596+
repeat for each line tLine in tScriptsList
9597+
if revIDEObjectIsOnIDEStack(tLine) then
9598+
put tLine & cr after tRemoveFrontList
9599+
remove script of tLine from front
95969600
end if
95979601
end repeat
95989602
put the backScripts into tScriptsList
9599-
repeat for each line l in tScriptsList
9600-
if char 1 to 3 of the short name of l is "rev" then
9601-
put l & cr after tRemoveBackList
9602-
remove script of l from back
9603+
repeat for each line tLine in tScriptsList
9604+
if revIDEObjectIsOnIDEStack(tLine) then
9605+
put tLine & cr after tRemoveBackList
9606+
remove script of tLine from back
96039607
end if
96049608
end repeat
96059609
else
96069610
put the frontScripts into tScriptsList
9607-
repeat for each line l in tScriptsList
9608-
if the short name of l is among the items of "revFrontScriptLibrary,revDebugger,revShortCutsLibrary" then
9609-
put l & cr after tRemoveFrontList
9610-
remove script of l from front
9611+
repeat for each line tLine in tScriptsList
9612+
if the short name of tLine is among the items of "revFrontScriptLibrary,revDebuggerLibrary,revShortCutsLibrary" then
9613+
put tLine & cr after tRemoveFrontList
9614+
remove script of tLine from front
96119615
end if
96129616
end repeat
96139617
put the backScripts into tScriptsList
9614-
repeat for each line l in tScriptsList
9615-
if the short name of l is "revBackScriptLibrary,revShortCutsLibrary" then
9616-
put l & cr after tRemoveBackList
9617-
remove script of l from back
9618+
repeat for each line tLine in tScriptsList
9619+
if the short name of tLine is "revBackScriptLibrary,revShortCutsLibrary" then
9620+
put tLine & cr after tRemoveBackList
9621+
remove script of tLine from back
96189622
end if
96199623
end repeat
96209624
end if
@@ -9626,7 +9630,7 @@ command revIDESuspendDevelopmentTools
96269630
put the openStacks into tList
96279631
lock messages
96289632
repeat for each line tStack in tList
9629-
if char 1 to 3 of the short name of stack tStack is "rev" or the short name of stack tStack is among the items of "Message Box,Home,answer dialog,ask dialog" then
9633+
if revIDEStackNameIsIDEStack(tStack) then
96309634
# OK-2008-05-23 : Compare the stack's mode to its style. If they are equal then we don't need to store the mode, as opening the
96319635
# stack will result in the default mode being that which matches its style.
96329636
local tModeName

notes/bugfix-20535.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Check for IDE stacks correctly when toggling `Suppress Messages`

notes/bugfix-20536.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Check for IDE stacks correctly when suspending development tools

0 commit comments

Comments
 (0)