Merge pull request #4665 from fr500/master

fix #4663
This commit is contained in:
bparker06 2017-02-18 20:41:58 -05:00 committed by GitHub
commit 0231585d06

View File

@ -997,6 +997,7 @@ static void task_push_save_state(const char *path, void *data, size_t size, bool
state->autosave = autosave;
state->mute = autosave; /* don't show OSD messages if we are auto-saving */
state->thumbnail_enable = settings->savestate_thumbnail_enable;
state->state_slot = settings->state_slot;
task->type = TASK_TYPE_BLOCKING;
task->state = state;
@ -1055,6 +1056,7 @@ static void task_push_load_and_save_state(const char *path, void *data,
{
retro_task_t *task = (retro_task_t*)calloc(1, sizeof(*task));
save_task_state_t *state = (save_task_state_t*)calloc(1, sizeof(*state));
settings_t *settings = config_get_ptr();
if (!task || !state)
goto error;
@ -1065,6 +1067,7 @@ static void task_push_load_and_save_state(const char *path, void *data,
state->undo_data = data;
state->autosave = autosave;
state->mute = autosave; /* don't show OSD messages if we are auto-saving */
state->state_slot = settings->state_slot;
task->state = state;
task->type = TASK_TYPE_BLOCKING;
@ -1192,6 +1195,7 @@ bool content_load_state(const char *path,
{
retro_task_t *task = (retro_task_t*)calloc(1, sizeof(*task));
save_task_state_t *state = (save_task_state_t*)calloc(1, sizeof(*state));
settings_t *settings = config_get_ptr();
if (!task || !state)
goto error;
@ -1199,6 +1203,7 @@ bool content_load_state(const char *path,
strlcpy(state->path, path, sizeof(state->path));
state->load_to_backup_buffer = load_to_backup_buffer;
state->autoload = autoload;
state->state_slot = settings->state_slot;
task->type = TASK_TYPE_BLOCKING;
task->state = state;