Commit b0ef07a7 authored by Cyril Deguet's avatar Cyril Deguet
Browse files

* fixed a segfault in FileInfo when p_info->psz_name == NULL

  but there are still other segfaults sometimes in FileInfo !!
parent 268c70ea
......@@ -2,7 +2,7 @@
* skin_common.h: Private Skin interface description
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: skin_common.h,v 1.17 2003/06/09 14:04:20 asmax Exp $
* $Id: skin_common.h,v 1.18 2003/06/09 19:08:33 asmax Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -43,6 +43,7 @@ class wxIcon;
#define MOUSE_LEFT (1<<0)
#define MOUSE_RIGHT (1<<1)
#define KEY_CTRL (1<<2)
#define KEY_SHIFT (1<<3)
//---------------------------------------------------------------------------
......
......@@ -2,7 +2,7 @@
* x11_window.cpp: X11 implementation of the Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: x11_window.cpp,v 1.20 2003/06/09 14:04:20 asmax Exp $
* $Id: x11_window.cpp,v 1.21 2003/06/09 19:08:33 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
......@@ -262,8 +262,11 @@ bool X11Window::ProcessOSEvent( Event *evt )
button = 0;
if( ((XButtonEvent *)p2 )->state & ControlMask )
{
// Control key pressed
button |= KEY_CTRL;
}
if( ((XButtonEvent *)p2 )->state & ShiftMask )
{
button |= KEY_SHIFT;
}
switch( ( (XButtonEvent *)p2 )->button )
......@@ -309,9 +312,13 @@ bool X11Window::ProcessOSEvent( Event *evt )
button = 0;
if( ((XButtonEvent *)p2 )->state & ControlMask )
{
// Control key pressed
button |= KEY_CTRL;
}
if( ((XButtonEvent *)p2 )->state & ShiftMask )
{
button |= KEY_SHIFT;
}
switch( ( (XButtonEvent *)p2 )->button )
{
case 1:
......
......@@ -2,7 +2,7 @@
* fileinfo.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: fileinfo.cpp,v 1.15 2003/06/05 21:22:27 gbazin Exp $
* $Id: fileinfo.cpp,v 1.16 2003/06/09 19:08:33 asmax Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -117,7 +117,7 @@ void FileInfo::UpdateFileInfo()
{
input_thread_t *p_input = p_intf->p_sys->p_input;
if( !p_input || p_input->b_dead )
if( !p_input || p_input->b_dead || !p_input->psz_name )
{
if( fileinfo_root )
{
......
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