p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

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

diff --git a/cinelerra-5.1/cinelerra/exportedl.C b/cinelerra-5.1/cinelerra/exportedl.C
index 8cbbbf3f238ae3950197d2cb57ff71e8f226bf22..73e51cf16167bc165afb9e6af5cca1df6dca459c 100644 (file)
--- a/cinelerra-5.1/cinelerra/exportedl.C
+++ b/cinelerra-5.1/cinelerra/exportedl.C
@@ -26,12 +26,12 @@
 #include "edits.h"
 #include "edl.h"
 #include "edlsession.h"
-#include "errorbox.h"
 #include "file.h"
 #include "filesystem.h"
 #include "filexml.h"
 #include "language.h"
 #include "localsession.h"
+#include "mainerror.h"
 #include "mainsession.h"
 #include "mutex.h"
 #include "mwindowgui.h"
@@ -113,6 +113,10 @@ void ExportEDLAsset::export_it()
 {
        FILE *fh;
        fh = fopen(path, "w+");
+       if( !fh ) {
+               eprintf("unable to open file: %s", path);
+               return;
+       }
 
 // We currently only support exporting one track at a time
 // Find the track...
@@ -362,6 +366,7 @@ ExportEDLWindow::~ExportEDLWindow()
 
 void ExportEDLWindow::create_objects()
 {
+       lock_window("ExportEDLWindow::create_objects");
        int x = 5, y = 5;
        add_subwindow(new BC_Title(x, y,
                        _("Select a file to export to:")));
@@ -418,6 +423,7 @@ void ExportEDLWindow::create_objects()
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));
        show_window();
+       unlock_window();
 }