Commit 0648c70a authored by hartman's avatar hartman
Browse files

* modules/gui/macosx/info.m: keep the same panel open if track changes.

* modules/misc/httpd.c: removed an unused int.
parent a64501fd
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* info.m: MacOS X info panel * info.m: MacOS X info panel
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: info.m,v 1.4 2003/03/14 01:23:06 hartman Exp $ * $Id: info.m,v 1.5 2003/03/18 02:28:53 hartman Exp $
* *
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net> * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
* *
...@@ -74,11 +74,15 @@ ...@@ -74,11 +74,15 @@
- (void)updateInfo - (void)updateInfo
{ {
NSString *o_selectedPane;
if( ![o_window isVisible] ) if( ![o_window isVisible] )
{ {
return; return;
} }
o_selectedPane = [[o_selector selectedItem] title];
intf_thread_t * p_intf = [NSApp getIntf]; intf_thread_t * p_intf = [NSApp getIntf];
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ); FIND_ANYWHERE );
...@@ -113,7 +117,12 @@ ...@@ -113,7 +117,12 @@
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
[o_selector selectItemAtIndex: 0]; int i_select = [o_selector indexOfItemWithTitle:o_selectedPane];
if ( i_select < 0 )
{
i_select = 0;
}
[o_selector selectItemAtIndex: i_select ];
[self showCategory: o_selector]; [self showCategory: o_selector];
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* httpd.c * httpd.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2003 VideoLAN * Copyright (C) 2001-2003 VideoLAN
* $Id: httpd.c,v 1.10 2003/03/17 23:48:26 fenrir Exp $ * $Id: httpd.c,v 1.11 2003/03/18 02:28:53 hartman Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -1179,7 +1179,6 @@ static int httpd_page_admin_get( httpd_file_callback_args_t *p_args, ...@@ -1179,7 +1179,6 @@ static int httpd_page_admin_get( httpd_file_callback_args_t *p_args,
{ {
httpd_sys_t *p_httpt = (httpd_sys_t*)p_args; httpd_sys_t *p_httpt = (httpd_sys_t*)p_args;
httpd_connection_t *p_con; httpd_connection_t *p_con;
int i;
if( i_request > 0) if( i_request > 0)
{ {
......
Supports Markdown
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