claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaked the hard disk image loading a bit in order to prevent double opening of the same file.

Browse Source
This commit is contained in:
OBattler
2017-06-22 18:24:17 +02:00
parent d9270aedb5
commit fd307dd24b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/hdd_image.c
View File

@@ -124,18 +124,22 @@ int hdd_image_load(int id)
int c;
uint64_t i = 0, s = 0, t = 0;
wchar_t *fn = hdc[id].fn;
int is_hdx[2] = { 0, 0 };
memset(empty_sector, 0, sizeof(empty_sector));
hdd_images[id].base = 0;
hdd_images[id].loaded = 0;
if (hdd_images[id].file != NULL)
if (hdd_images[id].loaded)
{
fclose(hdd_images[id].file);
hdd_images[id].file = NULL;
hdd_images[id].loaded = 0;
}
is_hdx[0] = image_is_hdx(fn, 0);
is_hdx[1] = image_is_hdx(fn, 1);
/* Try to open existing hard disk image */
if (fn[0] == '.')
{
@@ -185,7 +189,7 @@ int hdd_image_load(int id)
}
hdd_images[id].type = 1;
}
else if (image_is_hdx(fn, 0))
else if (is_hdx[0])
{
full_size = hdc[id].spt * hdc[id].hpc * hdc[id].tracks * 512;
hdd_images[id].base = 0x28;
@@ -257,7 +261,7 @@ int hdd_image_load(int id)
hdc[id].tracks = tracks;
hdd_images[id].type = 1;
}
else if (image_is_hdx(fn, 1))
else if (is_hdx[1])
{
hdd_images[id].base = 0x28;
fseeko64(hdd_images[id].file, 8, SEEK_SET);