Must set readonly *after* mount() resets the readonly flag (FujiNetWIFI#994)

FozzTexx · web-flow · commit 58ec8f2c705d · 2025-08-11T10:57:28.000-07:00
This reverts commit 76b76fa.
diff --git a/lib/device/iwm/fuji.cpp b/lib/device/iwm/fuji.cpp
@@ -396,14 +396,13 @@ uint8_t iwmFuji::iwm_ctrl_disk_image_mount() // SP CTRL command
 	// mediatype_t mt = MediaType::discover_mediatype(disk.filename);
 	// if (mt == mediatype_t::MEDIATYPE_PO)
 	// { // And now mount it
+	disk.disk_type = disk_dev->mount(disk.fileh, disk.filename, disk.disk_size);
 
 	if (options == DISK_ACCESS_MODE_WRITE)
 	{
 		disk_dev->readonly = false;
 	}
 
-	disk.disk_type = disk_dev->mount(disk.fileh, disk.filename, disk.disk_size);
-
 	return SP_ERR_NOERROR;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -396,14 +396,13 @@ uint8_t iwmFuji::iwm_ctrl_disk_image_mount() // SP CTRL command`
`396`	`396`	`// mediatype_t mt = MediaType::discover_mediatype(disk.filename);`
`397`	`397`	`// if (mt == mediatype_t::MEDIATYPE_PO)`
`398`	`398`	`// { // And now mount it`
	`399`	`+ disk.disk_type = disk_dev->mount(disk.fileh, disk.filename, disk.disk_size);`
`399`	`400`
`400`	`401`	`if (options == DISK_ACCESS_MODE_WRITE)`
`401`	`402`	`{`
`402`	`403`	`disk_dev->readonly = false;`
`403`	`404`	`}`
`404`	`405`
`405`		`- disk.disk_type = disk_dev->mount(disk.fileh, disk.filename, disk.disk_size);`
`406`		`-`
`407`	`406`	`return SP_ERR_NOERROR;`
`408`	`407`	`}`
`409`	`408`