improve resize flash operation, fixup xv grab/ungrab, fixup label updates

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

diff --git a/cinelerra-5.1/cinelerra/brender.C b/cinelerra-5.1/cinelerra/brender.C
index 94a569a7faaf8bf7bbbe6dd545ecf319ad36574c..3a1e3f82e4c7e61d88af0a6c303170dbee5bd4d5 100644 (file)
--- a/cinelerra-5.1/cinelerra/brender.C
+++ b/cinelerra-5.1/cinelerra/brender.C
@@ -49,7 +49,7 @@
 
 extern "C"
 {
-#include <uuid/uuid.h>
+#include <uuid.h>
 }
 
 
@@ -93,9 +93,9 @@ TRACE("BRender::~BRender 5\n");
        {
                kill(master_pid, SIGKILL);
 TRACE("BRender::~BRender 6\n");
-               Thread::join();
 TRACE("BRender::~BRender 7\n");
        }
+       Thread::join();
 
 TRACE("BRender::~BRender 8\n");
        delete map_lock;