X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fguicast%2Fvicon.C;h=e9a71b154fae09ee47ef23992ce11d84d571d679;hb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;hp=deb3c57fd6370b1aa7af9b7d54ca4c88b8c01b9c;hpb=3ec3a9cc6afc6561311686b3ec597ee3c1d80d6f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/vicon.C b/cinelerra-5.1/guicast/vicon.C
index deb3c57f..e9a71b15 100644
--- a/cinelerra-5.1/guicast/vicon.C
+++ b/cinelerra-5.1/guicast/vicon.C
@@ -2,7 +2,7 @@
 
 #include "bctimer.h"
 #include "bcwindow.h"
-#include "colors.h"
+#include "bccolors.h"
 #include "keys.h"
 #include "mutex.h"
 #include "condition.h"
@@ -76,7 +76,7 @@ VIconThread(BC_WindowBase *wdw, int vw, int vh)
 	timer = new Timer();
 	this->refresh_rate = VICON_RATE;
 	done = 0;
-	interrupted = 1;
+	interrupted = -1;
 }
 
 VIconThread::
@@ -100,8 +100,9 @@ start_drawing()
 	wdw->lock_window("VIconThread::start_drawing");
 	if( view_win )
 		wdw->set_active_subwindow(view_win);
-        if( interrupted )
+        if( interrupted < 0 )
 		draw_lock->unlock();
+	interrupted = 0;
 	wdw->unlock_window();
 }
 
@@ -110,7 +111,8 @@ stop_drawing()
 {
 	wdw->lock_window("VIconThread::stop_drawing");
 	set_view_popup(0);
-	interrupted = 1;
+	if( !interrupted )
+		interrupted = 1;
 	wdw->unlock_window();
 }
 
@@ -260,9 +262,8 @@ run()
 {
 	while(!done) {
 		draw_lock->lock("VIconThread::run 0");
-		if( done ) break;;
+		if( done ) break;
 		wdw->lock_window("BC_WindowBase::run 1");
-		interrupted = 0;
 		drawing_started();
 		reset_images();
 		int64_t seq_no = 0, now = 0;