Commit 46611a14 authored by Ben Avison's avatar Ben Avison
Browse files

Now ignores the first Message_ModeChange received but does act on the second...

Now ignores the first Message_ModeChange received but does act on the second one in the manner intended (ie closes banner window). The first message is generated by the Wimp during one of the first Wimp_Polls, but old Wimps corrupted the message list pointer they were passed if the task didn't follow Wimp_StartTask (which is the case with the initial *Desktop that launches the desktop) so this bug was never apparent before.

Version 2.63. Tagged as 'Desktop-2_63'
parent 1efa2ad9
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.68.
;
GBLS Module_MajorVersion
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.62"
Module_Version SETA 262
Module_MajorVersion SETS "2.63"
Module_Version SETA 263
Module_MinorVersion SETS ""
Module_Date SETS "16 Mar 2001"
Module_ApplicationDate2 SETS "16-Mar-01"
Module_ApplicationDate4 SETS "16-Mar-2001"
Module_Date SETS "31 Oct 2002"
Module_ApplicationDate SETS "31-Oct-02"
Module_ComponentName SETS "Desktop"
Module_ComponentPath SETS "RiscOS/Sources/Desktop/Desktop"
Module_FullVersion SETS "2.62"
Module_HelpVersion SETS "2.62 (16 Mar 2001)"
Module_FullVersion SETS "2.63"
Module_HelpVersion SETS "2.63 (31 Oct 2002)"
END
/* (2.62)
/* (2.63)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 2.62
#define Module_MajorVersion_CMHG 2.63
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 16 Mar 2001
#define Module_Date_CMHG 31 Oct 2002
#define Module_MajorVersion "2.62"
#define Module_Version 262
#define Module_MajorVersion "2.63"
#define Module_Version 263
#define Module_MinorVersion ""
#define Module_Date "16 Mar 2001"
#define Module_Date "31 Oct 2002"
#define Module_ApplicationDate2 "16-Mar-01"
#define Module_ApplicationDate4 "16-Mar-2001"
#define Module_ApplicationDate "31-Oct-02"
#define Module_ComponentName "Desktop"
#define Module_ComponentPath "RiscOS/Sources/Desktop/Desktop"
#define Module_FullVersion "2.62"
#define Module_HelpVersion "2.62 (16 Mar 2001)"
#define Module_FullVersion "2.63"
#define Module_HelpVersion "2.63 (31 Oct 2002)"
#define Module_LibraryVersionInfo "2:63"
......@@ -128,6 +128,7 @@ PumpHidden # 4
PumpParams_0 # 4
PumpParams_1 # 4
PumpParams_2 # 4
ModeChangeCount # 4 ; how many times we've seen Message_ModeChange
scratchbuffer1 # 256
scratchbuffer2 # 256
Working_Stack # 128
......@@ -411,6 +412,9 @@ StartAsTask
]
BVS Exit
MOV R14, #0
STR R14, ModeChangeCount
[ debugtm
SWI XOS_ReadMonotonicTime
Pull "r1"
......@@ -622,9 +626,13 @@ KeepItUpLoop
GotMessageKeepingItUp
LDR lr, scratchbuffer1 + ms_action
TEQ lr, #Message_Quit
LDRNE r2, =Message_ModeChange
TEQNE lr, r2 ; Because we can't be bothered to recache fonts...
LDR r2, =Message_ModeChange
TEQ lr, r2
LDREQ r2, ModeChangeCount
ADDEQ r2, r2, #1 ; ignore ModeChange unless we've already had one
STREQ r2, ModeChangeCount ; but subsequent ones are important
TEQEQ r2, #2 ; because we can't be bothered to recache fonts...
TEQNE lr, #Message_Quit
BEQ Exit
B KeepItUpLoop
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment