Commit 17b44c2a authored by Ben Avison's avatar Ben Avison
Browse files

Wimp_SetMode called outside the desktop now has no effect again.

Detail:
  32-bitising introduced the bug: the routine copy_mode_specifier no longer
  preserves flags, but Wimp_SetMode was relying on it doing so. Wimp_SetMode
  has been changed to re-test the number of active tasks again after the flags
  have been corrupted.
Admin:
  Tested in a desktop build.

Version 4.60. Tagged as 'Wimp-4_60'
parent 1d2c1d44
......@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "4.59"
Module_Version SETA 459
Module_MajorVersion SETS "4.60"
Module_Version SETA 460
Module_MinorVersion SETS ""
Module_Date SETS "08 Nov 2000"
Module_ApplicationDate2 SETS "08-Nov-00"
Module_ApplicationDate4 SETS "08-Nov-2000"
Module_Date SETS "30 Nov 2000"
Module_ApplicationDate2 SETS "30-Nov-00"
Module_ApplicationDate4 SETS "30-Nov-2000"
Module_ComponentName SETS "Wimp"
Module_ComponentPath SETS "RiscOS/Sources/Desktop/Wimp"
Module_FullVersion SETS "4.59"
Module_HelpVersion SETS "4.59 (08 Nov 2000)"
Module_FullVersion SETS "4.60"
Module_HelpVersion SETS "4.60 (30 Nov 2000)"
END
/* (4.59)
/* (4.60)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 4.59
#define Module_MajorVersion_CMHG 4.60
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 08 Nov 2000
#define Module_Date_CMHG 30 Nov 2000
#define Module_MajorVersion "4.59"
#define Module_Version 459
#define Module_MajorVersion "4.60"
#define Module_Version 460
#define Module_MinorVersion ""
#define Module_Date "08 Nov 2000"
#define Module_Date "30 Nov 2000"
#define Module_ApplicationDate2 "08-Nov-00"
#define Module_ApplicationDate4 "08-Nov-2000"
#define Module_ApplicationDate2 "30-Nov-00"
#define Module_ApplicationDate4 "30-Nov-2000"
#define Module_ComponentName "Wimp"
#define Module_ComponentPath "RiscOS/Sources/Desktop/Wimp"
#define Module_FullVersion "4.59"
#define Module_HelpVersion "4.59 (08 Nov 2000)"
#define Module_FullVersion "4.60"
#define Module_HelpVersion "4.60 (30 Nov 2000)"
......@@ -1748,8 +1748,8 @@ SWIWimp_SetMode
BL validatemode
BVS ExitWimp
LDR R14,taskcount
CMP R14,#0
LDR R2,taskcount
CMP R2,#0
BGT %FT01
[ Medusa
BL copy_mode_specifier
......@@ -1758,6 +1758,7 @@ SWIWimp_SetMode
01 LDR R1,commandflag ; you can change mode without penalty
ORR R14,R1,#cf_suspended ; since the desktop is intact
STR R14,commandflag
CMP R2,#0
BLGT int_setmode
STR R1,commandflag
......
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