[MPlayer-cvslog] r24717 - in trunk: mp_msg.c stream/cache2.c

[reimar]

Author: reimar
Date: Sun Oct  7 10:41:31 2007
New Revision: 24717

Log:
Make sure forked code does not try to display a GTK message box (and thus crashes)


Modified:
   trunk/mp_msg.c
   trunk/stream/cache2.c

Modified: trunk/mp_msg.c
==============================================================================
--- trunk/mp_msg.c	(original)
+++ trunk/mp_msg.c	Sun Oct  7 10:41:31 2007
@@ -16,6 +16,7 @@ extern char* get_term_charset(void);
 
 #if defined(FOR_MENCODER)
 #undef HAVE_NEW_GUI
+int use_gui;
 #endif
 
 #ifdef HAVE_NEW_GUI

Modified: trunk/stream/cache2.c
==============================================================================
--- trunk/stream/cache2.c	(original)
+++ trunk/stream/cache2.c	Sun Oct  7 10:41:31 2007
@@ -29,6 +29,7 @@ static DWORD WINAPI ThreadProc(void* s);
 
 #include "stream.h"
 #include "input/input.h"
+extern int use_gui;
 
 int stream_fill_buffer(stream_t *s);
 int stream_seek_long(stream_t *s,off_t pos);
@@ -305,6 +306,9 @@ int stream_enable_cache(stream_t *stream
 static DWORD WINAPI ThreadProc(void*s){
 #endif
   
+#ifdef HAVE_NEW_GUI
+  use_gui = 0; // mp_msg may not use gui stuff in forked code
+#endif
 // cache thread mainloop:
   signal(SIGTERM,exit_sighandler); // kill
   while(1){