griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

wm_event_do_handlers was calling sound_sync_scene() twice without error checking the result of the second call.

Browse Source
This commit is contained in:
Campbell Barton
2012-09-27 02:18:14 +00:00
parent 7b31b44241
commit c5baae40f7
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -2021,23 +2021,26 @@ void wm_event_do_handlers(bContext *C)
Scene *scene = win->screen->scene;
if (scene) {
int playing = sound_scene_playing(win->screen->scene);
int is_playing_sound = sound_scene_playing(win->screen->scene);
if (playing != -1) {
if (is_playing_sound != -1) {
int is_playing_screen;
CTX_wm_window_set(C, win);
CTX_wm_screen_set(C, win->screen);
CTX_data_scene_set(C, scene);
if (((playing == 1) && (!ED_screen_animation_playing(wm))) ||
((playing == 0) && (ED_screen_animation_playing(wm))))
is_playing_screen = (ED_screen_animation_playing(wm) != NULL);
if (((is_playing_sound == 1) && (is_playing_screen == 0)) ||
((is_playing_sound == 0) && (is_playing_screen == 1)))
{
ED_screen_animation_play(C, -1, 1);
}
if (playing == 0) {
float time = sound_sync_scene(scene);
if (is_playing_sound == 0) {
const float time = sound_sync_scene(scene);
if (finite(time)) {
int ncfra = sound_sync_scene(scene) * (float)FPS + 0.5f;
int ncfra = time * (float)FPS + 0.5f;
if (ncfra != scene->r.cfra) {
scene->r.cfra = ncfra;
ED_update_for_newframe(CTX_data_main(C), scene, 1);