[Mplayerplug-in-cvs] mplayerplug-in/Source plugin.cpp,1.275,1.276

[Kevin D. <kde...@us...>]

Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7243/Source

Modified Files:
	plugin.cpp 
Log Message:


Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.275
retrieving revision 1.276
diff -C2 -d -r1.275 -r1.276
*** plugin.cpp	23 Jan 2006 20:20:24 -0000	1.275
--- plugin.cpp	23 Jan 2006 21:37:02 -0000	1.276
***************
*** 394,400 ****
  	signalPlayerThread(this);
  	threadsignaled = 1;
!     }
  
      if (threadsetup == 1) {
  	if (threadlaunched == 1) {
  	    pthread_mutex_lock(&control_mutex);
--- 394,402 ----
  	signalPlayerThread(this);
  	threadsignaled = 1;
! 	
!     } 
  
      if (threadsetup == 1) {
+     
  	if (threadlaunched == 1) {
  	    pthread_mutex_lock(&control_mutex);
***************
*** 466,469 ****
--- 468,473 ----
  //	    if (GTK_IS_WIDGET(button_window))
  //		gtk_widget_destroy(button_window);
+   	    if (GTK_IS_WIDGET(gtkwidget))
+ 	        gtk_widget_hide(gtkwidget);
  	}
  	
***************
*** 1570,1574 ****
      Node *n;
  
!     if (state == STATE_PLAY_CANCELLED)
  	return -1;
  
--- 1574,1578 ----
      Node *n;
  
!     if (state == STATE_PLAY_CANCELLED || cancelled == 1)
  	return -1;
  
***************
*** 1715,1720 ****
      char *burl;
  
!     if (state == STATE_PLAY_CANCELLED)
  	return -1;
      if (td == NULL)
  	return -1;
--- 1719,1725 ----
      char *burl;
  
!     if (state == STATE_PLAY_CANCELLED || cancelled == 1)
  	return -1;
+     
      if (td == NULL)
  	return -1;