picon dirs, new cinfinity picons, plugin info, rework text drawing, show msg, compres...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / render.C

diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index cf0881080ac73bd7f55606ce22534f3bf9ca4573..34b5c7dc51eaf42ca45fab9051ad8d219345f68f 100644 (file)
--- a/cinelerra-5.1/cinelerra/render.C
+++ b/cinelerra-5.1/cinelerra/render.C
@@ -495,7 +495,8 @@ void Render::stop_progress()
 
                sprintf(string2, _("Rendering took %s"), string);
                mwindow->gui->lock_window("");
-               mwindow->gui->set_default_message(string2);
+               mwindow->gui->show_message(string2);
+               mwindow->gui->update_default_message();
                mwindow->gui->stop_hourglass();
                mwindow->gui->unlock_window();
        }
@@ -929,11 +930,7 @@ if(debug) printf("Render::render %d\n", __LINE__);
                if(render->load_mode == LOADMODE_PASTE)
                        mwindow->clear(0);
 if(debug) printf("Render::render %d\n", __LINE__);
-               mwindow->load_assets(assets,
-                       -1,
-                       render->load_mode,
-                       0,
-                       0,
+               mwindow->load_assets(assets, -1, render->load_mode, 0, 0,
                        mwindow->edl->session->labels_follow_edits,
                        mwindow->edl->session->plugins_follow_edits,
                        mwindow->edl->session->autos_follow_edits,