X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fcommercials.C;h=a5bc6fea43f4f1de0d926348eb8853899ad724a5;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hp=a08ec02921e1e058c1d07c78470d23affe75a9c3;hpb=21b49090a36821cfe97bdfc573c7fbacc80653d1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/commercials.C b/cinelerra-5.1/cinelerra/commercials.C
index a08ec029..a5bc6fea 100644
--- a/cinelerra-5.1/cinelerra/commercials.C
+++ b/cinelerra-5.1/cinelerra/commercials.C
@@ -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;
 }