Commit d2232557 authored by Ben Avison's avatar Ben Avison
Browse files

Minor bugfixes

Detail:
  The window block used to close the share window wasn't set up properly.
  Errors were being accidentally ignored if the CD drive didn't exist.
Admin:
  Changes from Adrian Lees

Version 2.48. Tagged as 'CDFSFiler-2_48'
parent 913e968c
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.68.
; Last processed by srccommit version: 1.1.
;
GBLS Module_MajorVersion
GBLA Module_Version
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.47"
Module_Version SETA 247
Module_MajorVersion SETS "2.48"
Module_Version SETA 248
Module_MinorVersion SETS ""
Module_Date SETS "12 Aug 2004"
Module_ApplicationDate SETS "12-Aug-04"
Module_Date SETS "10 May 2012"
Module_ApplicationDate SETS "10-May-12"
Module_ComponentName SETS "CDFSFiler"
Module_ComponentPath SETS "RiscOS/Sources/FileSys/CDFS/CDFSFiler"
Module_FullVersion SETS "2.47"
Module_HelpVersion SETS "2.47 (12 Aug 2004)"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/CDFS/CDFSFiler"
Module_FullVersion SETS "2.48"
Module_HelpVersion SETS "2.48 (10 May 2012)"
END
/* (2.47)
/* (2.48)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.47
#define Module_MajorVersion_CMHG 2.48
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 12 Aug 2004
#define Module_Date_CMHG 10 May 2012
#define Module_MajorVersion "2.47"
#define Module_Version 247
#define Module_MajorVersion "2.48"
#define Module_Version 248
#define Module_MinorVersion ""
#define Module_Date "12 Aug 2004"
#define Module_Date "10 May 2012"
#define Module_ApplicationDate "12-Aug-04"
#define Module_ApplicationDate "10-May-12"
#define Module_ComponentName "CDFSFiler"
#define Module_ComponentPath "RiscOS/Sources/FileSys/CDFS/CDFSFiler"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/CDFS/CDFSFiler"
#define Module_FullVersion "2.47"
#define Module_HelpVersion "2.47 (12 Aug 2004)"
#define Module_LibraryVersionInfo "2:47"
#define Module_FullVersion "2.48"
#define Module_HelpVersion "2.48 (10 May 2012)"
#define Module_LibraryVersionInfo "2:48"
......@@ -2462,7 +2462,7 @@ click_menu_iconbar ROUT
SWI XOS_ReadUnsigned
MOV r0, r2
BL MakeCDFSblockinR7
SWI XCD_IsDrawerLocked
SWIVC XCD_IsDrawerLocked
MOVS r0, r0
LDR r14, m_cdromdisc+m_headersize+mi_size*mo_cd_eject+mi_iconflags
ORRNE r14, r14, #is_shaded
......@@ -3593,7 +3593,7 @@ GoShare_disc
ADR r1, userdata ; close share window
LDR r0, sharewin_handle
STR r0, [r1, #mo_cf_shared]
STR r0, [r1]
SWI XWimp_CloseWindow
EXIT
......
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