fix uninitialize in awdw gui view popup, repair renderengine tracking position update

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / renderengine.C

diff --git a/cinelerra-5.1/cinelerra/renderengine.C b/cinelerra-5.1/cinelerra/renderengine.C
index 9b640d20e2ada9e5467960654c4fd1f9f267015b..25b8fbadf4eba14bc855b5a51353395ea80b7388 100644 (file)
--- a/cinelerra-5.1/cinelerra/renderengine.C
+++ b/cinelerra-5.1/cinelerra/renderengine.C
@@ -398,8 +398,10 @@ void RenderEngine::update_framerate(float framerate)
 
 void RenderEngine::wait_render_threads()
 {
+       interrupt_lock->unlock();
        if( do_audio ) arender->Thread::join();
        if( do_video ) vrender->Thread::join();
+       interrupt_lock->lock("RenderEngine::wait_render_threads");
 }
 
 void RenderEngine::interrupt_playback()
@@ -460,21 +462,18 @@ void RenderEngine::run()
 {
        render_active->lock("RenderEngine::run");
 
-       interrupt_lock->unlock();
        start_render_threads();
        wait_render_threads();
-       interrupt_lock->lock("RenderEngine::wait_render_threads");
 
        close_output();
 
-       if( playback_engine && playback_engine->is_playing_back ) {
-               double position = interrupted ?
-                       playback_engine->get_tracking_position() :
-                       command->get_direction() == PLAY_FORWARD ?
-                               command->end_position :
-                               command->start_position;
-               playback_engine->command->command = STOP;
-               if( playback_engine->is_playing_back && command->displacement ) {
+       if( playback_engine ) {
+               double position = command->command == CURRENT_FRAME ? command->playbackstart :
+                       playback_engine->is_playing_back && !interrupted ?
+                               ( command->get_direction() == PLAY_FORWARD ?
+                                       command->end_position : command->start_position ) :
+                               playback_engine->get_tracking_position() ;
+               if( command->displacement ) {
                        position -= 1./command->get_edl()->session->frame_rate;
                        if( position < 0 ) position = 0;
                }