X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcommercials.C;h=a81aafe8ee0357d295499fe10c5e97272d3fc96c;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=e74275b5db6f3c80a01605773fd81013f7f584d6;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/commercials.C b/cinelerra-5.1/cinelerra/commercials.C
index e74275b5..a81aafe8 100644
--- a/cinelerra-5.1/cinelerra/commercials.C
+++ b/cinelerra-5.1/cinelerra/commercials.C
@@ -533,7 +533,7 @@ cut_edit(Track *track, Edit *edit, int64_t clip_start, int64_t clip_end)
 		}
 	}
 	// cut edit
-	Edit *next_edit = track->edits->split_edit(edit, cut_start);
+	Edit *next_edit = edit->edits->split_edit(cut_start);
 	int64_t cut_length = cut_end - cut_start;
 	next_edit->length -= cut_length;
 	next_edit->startsource += cut_length;
@@ -559,7 +559,7 @@ scan_audio(int vstream, double start, double end)
 			Indexable *indexable = edit->get_source();
 			if( !indexable || !indexable->is_asset ) continue;
 			Asset *asset = (Asset *)indexable;
-			if( !scan_file->asset->equivalent(*asset,0,0) ) continue;
+			if( !scan_file->asset->equivalent(*asset,0,0,mwindow->edl) ) continue;
 			if( verify_edit(atrk, edit, start, end) ) continue;
 			next = cut_edit(atrk, edit,
 				atrk->to_units(start,0),
@@ -701,7 +701,7 @@ ScanStatusGUI(ScanStatus *sswindow, int x, int y, int nlines, int nbars)
 	40 + BC_CancelButton::calculate_h() +
 		(BC_Title::calculate_h((BC_WindowBase*) sswindow->
 			commercials->mwindow->gui, _("My")) + 5) * nlines +
-		(BC_ProgressBar::calculate_h() + 5) * nbars, 0, 0, 0) 
+		(BC_ProgressBar::calculate_h() + 5) * nbars, 0, 0, 0)
 {
 	this->sswindow = sswindow;
 	this->nlines = nlines;
@@ -787,8 +787,8 @@ stop()
 	if( running() ) {
 		if( gui ) gui->set_done(1);
 		cancel();
-		join();
 	}
+	join();
 }
 
 void ScanStatus::
@@ -856,8 +856,8 @@ stop()
 		done = 1;
 		input_lock->unlock();
 		cancel();
-		join();
 	}
+	join();
 	if( commercials && !commercials->remove_user() )
 		commercials = 0;
 }