[xine-cvs] CVS: xine-ui/src/xitk actions.c,1.70,1.71 videowin.c,1.113,1.114

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory usw-pr-cvs1:/tmp/cvs-serv28471/src/xitk

Modified Files:
	actions.c videowin.c 
Log Message:
Fix a fullscreen->windowed mode bug i've introduced few hours ago.


Index: actions.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/actions.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- actions.c	14 Jun 2002 09:32:37 -0000	1.70
+++ actions.c	9 Jul 2002 19:44:11 -0000	1.71
@@ -64,8 +64,8 @@
    * the original modeline
    */
   if(gGui->XF86VidMode_fullscreen)
-     video_window_set_fullscreen_mode (0);
-//     gui_set_fullscreen_mode(NULL,NULL);
+    video_window_set_fullscreen_mode (0);
+  //     gui_set_fullscreen_mode(NULL,NULL);
 #endif
    
   destroy_mrl_browser();

Index: videowin.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/videowin.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- videowin.c	9 Jul 2002 14:14:46 -0000	1.113
+++ videowin.c	9 Jul 2002 19:44:11 -0000	1.114
@@ -300,18 +300,23 @@
     return;
   }
 
-  switch (gVw->fullscreen_req && gGui->xine) {
+  switch (gVw->fullscreen_req) {
   case 0:
   case 1:
-    xine_tvmode_switch (gGui->xine, 0, gVw->video_width, gVw->video_height, gVw->video_duration);
+    if(gGui->xine)
+      xine_tvmode_switch (gGui->xine, 
+			  0, gVw->video_width, gVw->video_height, gVw->video_duration);
     break;
   case 2:
-    if (xine_tvmode_switch (gGui->xine, 1, 
-			    gVw->video_width, gVw->video_height, gVw->video_duration) != 1)
-      gVw->fullscreen_req = 0;
+    if(gGui->xine)
+      if (xine_tvmode_switch (gGui->xine,
+			      1, gVw->video_width, gVw->video_height, gVw->video_duration) != 1)
+	gVw->fullscreen_req = 0;
     break;
   default:
-    xine_tvmode_switch (gGui->xine, 0, gVw->video_width, gVw->video_height, gVw->video_duration);
+    if(gGui->xine)
+      xine_tvmode_switch (gGui->xine, 
+			  0, gVw->video_width, gVw->video_height, gVw->video_duration);
     gVw->fullscreen_req = 0;
   }