Commit 68cae2fd authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix getborder thinking indirected sprites have validation strings

Detail:
  s/Wimp10 - Corrected interrogation of icon flag word IST bits to avoid trying to parse the sprite area pointer of an indirected sprite as a validation string
Admin:
  Tested on BB-xM with high processor vectors
  Fixes crash when dragging file icons in saveas dialogs


Version 5.16. Tagged as 'Wimp-5_16'
parent 58562a0c
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.15"
Module_Version SETA 515
Module_MajorVersion SETS "5.16"
Module_Version SETA 516
Module_MinorVersion SETS ""
Module_Date SETS "24 Jun 2012"
Module_ApplicationDate SETS "24-Jun-12"
Module_Date SETS "09 Jul 2012"
Module_ApplicationDate SETS "09-Jul-12"
Module_ComponentName SETS "Wimp"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Wimp"
Module_FullVersion SETS "5.15"
Module_HelpVersion SETS "5.15 (24 Jun 2012)"
Module_FullVersion SETS "5.16"
Module_HelpVersion SETS "5.16 (09 Jul 2012)"
END
/* (5.15)
/* (5.16)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.15
#define Module_MajorVersion_CMHG 5.16
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 Jun 2012
#define Module_Date_CMHG 09 Jul 2012
#define Module_MajorVersion "5.15"
#define Module_Version 515
#define Module_MajorVersion "5.16"
#define Module_Version 516
#define Module_MinorVersion ""
#define Module_Date "24 Jun 2012"
#define Module_Date "09 Jul 2012"
#define Module_ApplicationDate "24-Jun-12"
#define Module_ApplicationDate "09-Jul-12"
#define Module_ComponentName "Wimp"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Wimp"
#define Module_FullVersion "5.15"
#define Module_HelpVersion "5.15 (24 Jun 2012)"
#define Module_LibraryVersionInfo "5:15"
#define Module_FullVersion "5.16"
#define Module_HelpVersion "5.16 (09 Jul 2012)"
#define Module_LibraryVersionInfo "5:16"
......@@ -36,8 +36,7 @@ getborder EntryS "R2,R4-R5"
MOV R4,#border_normal
MOV R5,#3 ; default values
TST R1,#if_sprite
TSTEQ R1,#if_text
TST R1,#if_text
TSTNE R1,#if_indirected
BEQ %FT11 ; if not indirected + text then ignore
;
......
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