add missing xml closers, add fix for folder bug, add roundoff fixups

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

diff --git a/cinelerra-5.1/cinelerra/cwindow.C b/cinelerra-5.1/cinelerra/cwindow.C
index cc5a2707cf716e71ee80605f4274d5fdd2cb63b4..022ee82e2b6c67b35e3afae617814911732b9eda 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindow.C
+++ b/cinelerra-5.1/cinelerra/cwindow.C
@@ -34,6 +34,7 @@
 #include "keys.h"
 #include "edl.h"
 #include "edlsession.h"
+#include "language.h"
 #include "localsession.h"
 #include "mainmenu.h"
 #include "mainsession.h"
@@ -65,8 +66,8 @@ CWindow::~CWindow()
 {
        if(gui && running()) {
                gui->set_done(0);
-               join();
        }
+       join();
        delete gui;  gui = 0;
        delete playback_engine;
        delete playback_cursor;
@@ -267,7 +268,7 @@ void CWindow::update(int position,
        }
 
        if(!mwindow->edl->session->cwindow_scrollbars)
-               gui->zoom_panel->update(AUTO_ZOOM);
+               gui->zoom_panel->update(_(AUTO_ZOOM));
        else
                gui->zoom_panel->update(mwindow->edl->session->cwindow_zoom);
 
@@ -360,9 +361,11 @@ int CWindowRemoteHandler::remote_process_key(RemoteControl *remote_control, int
        case 'a':  gui->tile_windows(0);                return 1;
        case 'b':  gui->tile_windows(1);                return 1;
        case 'c':  gui->tile_windows(2);                return 1;
+#ifdef HAVE_DVB
        case 'd':
                mwindow_gui->channel_info->toggle_scan();
                return 1;
+#endif
        case 'e':
                break;
        case 'f': {