X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fchannelinfo.C;h=7bcac18863e4bf243dbd0d672b8726e43f8a4fdb;hb=6fd57106820e676e368399d16b925bdc78d34621;hp=140f3d30e509848b7cb26d7045228b6f806a68fd;hpb=5820b5f022aeec75ec03f7dd0121aa8a3d7f7590;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/channelinfo.C b/cinelerra-5.1/cinelerra/channelinfo.C
index 140f3d30..7bcac188 100644
--- a/cinelerra-5.1/cinelerra/channelinfo.C
+++ b/cinelerra-5.1/cinelerra/channelinfo.C
@@ -1,3 +1,5 @@
+#ifdef HAVE_DVB
+
 #include "asset.h"
 #include "batch.h"
 #include "bctimer.h"
@@ -70,8 +72,8 @@ void ChanSearch::stop()
 		if( gui ) gui->set_done(1);
 		window_lock->unlock();
 		Thread::cancel();
-		Thread::join();
 	}
+	Thread::join();
 }
 
 void ChanSearch::run()
@@ -560,8 +562,8 @@ void ChannelProgress::stop()
 	if( Thread::running() ) {
 		done = 1;
 		Thread::cancel();
-		Thread::join();
 	}
+	Thread::join();
 }
 
 void ChannelProgress::run()
@@ -957,7 +959,7 @@ void ChannelPanel::get_xtime(int x, char *cp)
 	struct tm xtm;  localtime_r(&xt,&xtm);
 	cp += sprintf(cp,"%02d:%02d",xtm.tm_hour, xtm.tm_min);
 	if( !xtm.tm_hour && !xtm.tm_min ) {
-		sprintf(cp,_("(%3.3s) "),&_("sunmontuewedthufrisat")[xtm.tm_wday*3]);
+		sprintf(cp,"(%3.3s) ",&_("sunmontuewedthufrisat")[xtm.tm_wday*3]);
 	}
 }
 
@@ -1036,7 +1038,6 @@ int ChannelInfoFind::handle_event()
 	return 1;
 }
 
-
 void ChannelThread::start()
 {
 	if( !Thread::running() ) {
@@ -1050,8 +1051,8 @@ void ChannelThread::stop()
 	if( Thread::running() ) {
 		done = 1;
 		Thread::cancel();
-		Thread::join();
 	}
+	Thread::join();
 }
 
 ChannelThread::ChannelThread(ChannelInfoGUI *gui)
@@ -1655,8 +1656,8 @@ void ChannelInfo::stop()
 		if( gui ) gui->stop(1);
 		window_lock->unlock();
 		Thread::cancel();
-		Thread::join();
 	}
+	Thread::join();
 }
 
 void ChannelInfo::run()
@@ -1946,4 +1947,5 @@ int ChannelDeleteBatch::handle_event()
 	return RecordBatchesGUI::DeleteBatch::handle_event();
 }
 
+#endif