Commit c5dd4153 authored by Olivier Teulière's avatar Olivier Teulière

* ./src/interface/main.c: check that channels have been created before
  the call to network_ChannelJoin
parent d7bba658
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* and spawn threads. * and spawn threads.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: main.c,v 1.173 2002/03/29 00:14:19 massiot Exp $ * $Id: main.c,v 1.174 2002/04/02 21:56:19 ipkiss Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -769,7 +769,7 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) ...@@ -769,7 +769,7 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
/* /*
* Go back into channel 0 which is the network * Go back into channel 0 which is the network
*/ */
if( config_GetIntVariable( "network_channel" ) ) if( config_GetIntVariable( "network_channel" ) && p_main->p_channel )
{ {
network_ChannelJoin( COMMON_CHANNEL ); network_ChannelJoin( COMMON_CHANNEL );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment