X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcsynchronous.C;h=54f5eec2c5ca500e675ef58fb150845abaf9effc;hp=a8eccf2356298c07765b52a5419f39a2f7ad8302;hb=b0adaf11e855fd84af935d879848467a957d6c67;hpb=50a589b1decdd353a984d8a710e064ebaf8b4f7b

diff --git a/cinelerra-5.1/guicast/bcsynchronous.C b/cinelerra-5.1/guicast/bcsynchronous.C
index a8eccf23..54f5eec2 100644
--- a/cinelerra-5.1/guicast/bcsynchronous.C
+++ b/cinelerra-5.1/guicast/bcsynchronous.C
@@ -119,8 +119,8 @@ BC_Synchronous::~BC_Synchronous()
 {
 	if( running() ) {
 		quit();
-		join();
 	}
+	join();
 	commands.remove_all_objects();
 	delete lock_sync;
 	delete next_command;
@@ -473,13 +473,12 @@ void BC_Synchronous::put_pbuffer(int w, int h,
 	table_lock->lock("BC_Resources::release_textures");
 	for(int i = 0; i < pbuffer_ids.total; i++) {
 		PBufferID *ptr = pbuffer_ids.values[i];
-		if(ptr->w == w && ptr->h == h && ptr->glx_pbuffer == glx_pbuffer) {
+		if( ptr->w == w && ptr->h == h && ptr->glx_pbuffer == glx_pbuffer ) {
 			exists = 1;
 			break;
 		}
 	}
 
-
 	if(!exists) {
 		PBufferID *ptr = new PBufferID(current_window->get_id(),
 			glx_pbuffer, glx_context, w, h);
@@ -488,10 +487,7 @@ void BC_Synchronous::put_pbuffer(int w, int h,
 	table_lock->unlock();
 }
 
-GLXPbuffer BC_Synchronous::get_pbuffer(int w,
-	int h,
-	int *window_id,
-	GLXContext *glx_context)
+GLXPbuffer BC_Synchronous::get_pbuffer(int w, int h, GLXContext *glx_context)
 {
 	table_lock->lock("BC_Resources::release_textures");
 	for(int i = 0; i < pbuffer_ids.total; i++) {
@@ -500,7 +496,6 @@ GLXPbuffer BC_Synchronous::get_pbuffer(int w,
 			ptr->window_id == current_window->get_id() ) {
 			GLXPbuffer result = ptr->glx_pbuffer;
 			*glx_context = ptr->glx_context;
-			*window_id = ptr->window_id;
 			ptr->in_use = 1;
 			table_lock->unlock();
 			return result;
@@ -515,7 +510,7 @@ void BC_Synchronous::release_pbuffer(int window_id, GLXPbuffer pbuffer)
 	table_lock->lock("BC_Resources::release_textures");
 	for(int i = 0; i < pbuffer_ids.total; i++) {
 		PBufferID *ptr = pbuffer_ids.values[i];
-		if(ptr->window_id == window_id) {
+		if( ptr->window_id == window_id ) {
 			ptr->in_use = 0;
 		}
 	}