projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to ffmpeg-2.8
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
vwindow.C
diff --git
a/cinelerra-5.0/cinelerra/vwindow.C
b/cinelerra-5.0/cinelerra/vwindow.C
index a7e7fa78ea18fe341366f902323526e4ff2c9a10..57459ef9d154087f0e4099b64e2a11493a79be96 100644
(file)
--- a/
cinelerra-5.0/cinelerra/vwindow.C
+++ b/
cinelerra-5.0/cinelerra/vwindow.C
@@
-46,7
+46,8
@@
#include "vwindowgui.h"
#include "vwindowgui.h"
-VWindow::VWindow(MWindow *mwindow) : BC_DialogThread()
+VWindow::VWindow(MWindow *mwindow)
+ : BC_DialogThread()
{
this->mwindow = mwindow;
gui = 0;
{
this->mwindow = mwindow;
gui = 0;
@@
-60,10
+61,7
@@
VWindow::VWindow(MWindow *mwindow) : BC_DialogThread()
VWindow::~VWindow()
{
VWindow::~VWindow()
{
- if(is_running()) {
- close_window();
- join();
- }
+ close_window();
//printf("VWindow::~VWindow 1\n");
delete playback_engine;
//printf("VWindow::~VWindow 1\n");
//printf("VWindow::~VWindow 1\n");
delete playback_engine;
//printf("VWindow::~VWindow 1\n");