mirror of
https://github.com/CTCaer/RetroArch.git
synced 2025-01-27 06:11:51 +00:00
Fix failed merge
This commit is contained in:
parent
7440c4a5a7
commit
9a0c0d8b74
@ -134,19 +134,19 @@ void* nbio_get_ptr(struct nbio_t* handle, size_t* len)
|
||||
|
||||
void nbio_cancel(struct nbio_t* handle)
|
||||
{
|
||||
handle->op = -1;
|
||||
handle->progress = handle->len;
|
||||
handle->op = -1;
|
||||
handle->progress = handle->len;
|
||||
}
|
||||
|
||||
void nbio_free(struct nbio_t* handle)
|
||||
{
|
||||
if (!handle)
|
||||
return;
|
||||
if (handle->op >= 0)
|
||||
{
|
||||
puts("ERROR - attempted free() while busy");
|
||||
abort();
|
||||
}
|
||||
if (!handle)
|
||||
return;
|
||||
fclose(handle->f);
|
||||
free(handle->data);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user