Commit 60b0d7fd authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix reinitramfsfiler logic

Detail:
  s/Switcher - My previous checkin broke the reinitramfsfiler logic, causing the StartFiler service call to not be sent when it should have been.
Admin:
  Tested properly this time; RAM disc creation/resizing/destruction works properly now.


Version 1.31. Tagged as 'Switcher-1_31'
parent 0bcae231
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.30"
Module_Version SETA 130
Module_MajorVersion SETS "1.31"
Module_Version SETA 131
Module_MinorVersion SETS ""
Module_Date SETS "14 Nov 2010"
Module_ApplicationDate SETS "14-Nov-10"
Module_Date SETS "21 Nov 2010"
Module_ApplicationDate SETS "21-Nov-10"
Module_ComponentName SETS "Switcher"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Switcher"
Module_FullVersion SETS "1.30"
Module_HelpVersion SETS "1.30 (14 Nov 2010)"
Module_FullVersion SETS "1.31"
Module_HelpVersion SETS "1.31 (21 Nov 2010)"
END
/* (1.30)
/* (1.31)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.30
#define Module_MajorVersion_CMHG 1.31
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 14 Nov 2010
#define Module_Date_CMHG 21 Nov 2010
#define Module_MajorVersion "1.30"
#define Module_Version 130
#define Module_MajorVersion "1.31"
#define Module_Version 131
#define Module_MinorVersion ""
#define Module_Date "14 Nov 2010"
#define Module_Date "21 Nov 2010"
#define Module_ApplicationDate "14-Nov-10"
#define Module_ApplicationDate "21-Nov-10"
#define Module_ComponentName "Switcher"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Switcher"
#define Module_FullVersion "1.30"
#define Module_HelpVersion "1.30 (14 Nov 2010)"
#define Module_LibraryVersionInfo "1:30"
#define Module_FullVersion "1.31"
#define Module_HelpVersion "1.31 (21 Nov 2010)"
#define Module_LibraryVersionInfo "1:31"
......@@ -5136,11 +5136,11 @@ drag_complete ROUT
reinitramfsfiler ROUT
Push "R1-R2,LR"
LDR R14,dragBar ; check whether we're dragging the RAMFS bar
CMP R14,#-2
Pull "R1-R2,PC",HS
CMP R14,#0
LDRNEB R14,[R14,#icb_icon1]
CMPNE R14,#ic_ramdisc
SUB R14,R14,#1
CMP R14,#-3
LDRLOB R14,[R14,#icb_icon1+1]
ASSERT ic_ramdisc < -3 ; can't match unless we ARE dragging
CMP R14,#ic_ramdisc
LDRNEB R14,ramfsflag ; does RAMFSFiler need it?
CMPNE R14,#0
Pull "R1-R2,PC",EQ
......
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