* src/libvlc.c, include/vlc_interface.h: don't open a win32 console when using a...

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 9182e3a6b240882a15470ba64c1d82a1675721b7..0032475020aa94a4bd1d486d5b11273f43d89af5 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -118,10 +118,13 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
  *****************************************************************************/
 #if defined( WIN32 ) && !defined( UNDER_CE )
 #    define CONSOLE_INTRO_MSG \
+         if( !getenv( "PWD" ) || !getenv( "PS1" ) ) /* detect cygwin shell */ \
+         { \
          AllocConsole(); \
          freopen( "CONOUT$", "w", stdout ); \
          freopen( "CONOUT$", "w", stderr ); \
          freopen( "CONIN$", "r", stdin ); \
+         } \
          msg_Info( p_intf, COPYRIGHT_MESSAGE ); \
          msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \
                              "anymore, open a dos command box, go to the " \

diff --git a/src/libvlc.c b/src/libvlc.c
index 31390bf41cecfbada4f6935f9a71827449c982a9..8164fa2ef262b476490912bb7d18b72fb7036fa8 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -2168,11 +2168,15 @@ static void Version( void )
 static void ShowConsole( void )
 {
 #   ifndef UNDER_CE
+
+    if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
+
     AllocConsole();
     freopen( "CONOUT$", "w", stdout );
     freopen( "CONOUT$", "w", stderr );
     freopen( "CONIN$", "r", stdin );
 #   endif
+
     return;
 }
 #endif