add more build controls

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

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 381b0c1afe7c0d1486f8523b7f79a40bbc7174d4..9a77005bd0001615caa91a7caab3dc24d4dbc026 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -220,7 +220,9 @@ MWindow::~MWindow()
        gui->stop_drawing();
        gui->remote_control->deactivate();
        gui->record->stop();
+#ifdef HAVE_DVB
        gui->channel_info->stop();
+#endif
        brender_lock->lock("MWindow::quit");
        delete brender;         brender = 0;
        brender_lock->unlock();
@@ -1814,7 +1816,7 @@ void MWindow::init_shm()
        }
 
        int64_t result = 0;
-       fscanf(fd, _LD, &result);
+       fscanf(fd, "%jd", &result);
        fclose(fd);
        fd = 0;
        if(result < 0x7fffffff) {
@@ -3197,6 +3199,7 @@ int MWindow::run_script(FileXML *script)
 
 int MWindow::interrupt_indexes()
 {
+       mainprogress->cancelled = 1;
        mainindexes->interrupt_build();
        return 0;
 }
@@ -3512,7 +3515,7 @@ int MWindow::select_asset(int vtrack, int delete_tracks)
        if( !edit ) return 1;
        Asset *asset = edit->asset;
        if( !asset || !asset->is_asset ) return 1;
-       return select_asset(asset, edit->channel, -1, delete_tracks);
+       return select_asset(asset, edit->channel, 0, delete_tracks);
 }
 
 void MWindow::dump_plugindb(FILE *fp)