ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1761 from heuripedes/master 

Fixes
This commit is contained in:
Twinaphex 2015-06-09 22:11:22 +02:00
parent b321c38d62 aa80b352ee
commit 5658dd8aca
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver.h
View File

@ -299,7 +299,7 @@ typedef struct driver
const video_poke_interface_t *video_poke;
/* Last message given to the video driver */
const char *current_msg;
char current_msg[PATH_MAX_LENGTH];
} driver_t;
/**

7
libretro_version_1.c
View File

@ -114,7 +114,10 @@ static void video_frame(const void *data, unsigned width,
msg = rarch_main_msg_queue_pull();
driver->current_msg = msg;
*driver->current_msg = 0;
if (msg)
strlcpy(driver->current_msg, msg, sizeof(driver->current_msg));
if (video_driver_frame_filter(data, width, height, pitch,
&output_width, &output_height, &output_pitch))
@ -125,7 +128,7 @@ static void video_frame(const void *data, unsigned width,
pitch = output_pitch;
}
if (!video_driver_frame(data, width, height, pitch, msg))
if (!video_driver_frame(data, width, height, pitch, driver->current_msg))
driver->video_active = false;
}

7
playlist.c
View File

@ -270,12 +270,15 @@ void content_playlist_free(content_playlist_t *playlist)
return;
if (playlist->conf_path)
content_playlist_write_file(playlist);
free(playlist->conf_path);
free(playlist->conf_path);
playlist->conf_path = NULL;
for (i = 0; i < playlist->cap; i++)
content_playlist_free_entry(&playlist->entries[i]);
free(playlist->entries);
playlist->entries = NULL;
free(playlist);
}