Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
b0ef07a7
Commit
b0ef07a7
authored
Jun 09, 2003
by
Cyril Deguet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* fixed a segfault in FileInfo when p_info->psz_name == NULL
but there are still other segfaults sometimes in FileInfo !!
parent
268c70ea
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
6 deletions
+14
-6
modules/gui/skins/src/skin_common.h
modules/gui/skins/src/skin_common.h
+2
-1
modules/gui/skins/x11/x11_window.cpp
modules/gui/skins/x11/x11_window.cpp
+10
-3
modules/gui/wxwindows/fileinfo.cpp
modules/gui/wxwindows/fileinfo.cpp
+2
-2
No files found.
modules/gui/skins/src/skin_common.h
View file @
b0ef07a7
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* skin_common.h: Private Skin interface description
* skin_common.h: Private Skin interface description
*****************************************************************************
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* Copyright (C) 2003 VideoLAN
* $Id: skin_common.h,v 1.1
7 2003/06/09 14:04:20
asmax Exp $
* $Id: skin_common.h,v 1.1
8 2003/06/09 19:08:33
asmax Exp $
*
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
@@ -43,6 +43,7 @@ class wxIcon;
...
@@ -43,6 +43,7 @@ class wxIcon;
#define MOUSE_LEFT (1<<0)
#define MOUSE_LEFT (1<<0)
#define MOUSE_RIGHT (1<<1)
#define MOUSE_RIGHT (1<<1)
#define KEY_CTRL (1<<2)
#define KEY_CTRL (1<<2)
#define KEY_SHIFT (1<<3)
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
...
...
modules/gui/skins/x11/x11_window.cpp
View file @
b0ef07a7
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* x11_window.cpp: X11 implementation of the Window class
* x11_window.cpp: X11 implementation of the Window class
*****************************************************************************
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* Copyright (C) 2003 VideoLAN
* $Id: x11_window.cpp,v 1.2
0 2003/06/09 14:04:20
asmax Exp $
* $Id: x11_window.cpp,v 1.2
1 2003/06/09 19:08:33
asmax Exp $
*
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Authors: Cyril Deguet <asmax@videolan.org>
*
*
...
@@ -262,9 +262,12 @@ bool X11Window::ProcessOSEvent( Event *evt )
...
@@ -262,9 +262,12 @@ bool X11Window::ProcessOSEvent( Event *evt )
button
=
0
;
button
=
0
;
if
(
((
XButtonEvent
*
)
p2
)
->
state
&
ControlMask
)
if
(
((
XButtonEvent
*
)
p2
)
->
state
&
ControlMask
)
{
{
// Control key pressed
button
|=
KEY_CTRL
;
button
|=
KEY_CTRL
;
}
}
if
(
((
XButtonEvent
*
)
p2
)
->
state
&
ShiftMask
)
{
button
|=
KEY_SHIFT
;
}
switch
(
(
(
XButtonEvent
*
)
p2
)
->
button
)
switch
(
(
(
XButtonEvent
*
)
p2
)
->
button
)
{
{
...
@@ -309,9 +312,13 @@ bool X11Window::ProcessOSEvent( Event *evt )
...
@@ -309,9 +312,13 @@ bool X11Window::ProcessOSEvent( Event *evt )
button
=
0
;
button
=
0
;
if
(
((
XButtonEvent
*
)
p2
)
->
state
&
ControlMask
)
if
(
((
XButtonEvent
*
)
p2
)
->
state
&
ControlMask
)
{
{
// Control key pressed
button
|=
KEY_CTRL
;
button
|=
KEY_CTRL
;
}
}
if
(
((
XButtonEvent
*
)
p2
)
->
state
&
ShiftMask
)
{
button
|=
KEY_SHIFT
;
}
switch
(
(
(
XButtonEvent
*
)
p2
)
->
button
)
switch
(
(
(
XButtonEvent
*
)
p2
)
->
button
)
{
{
case
1
:
case
1
:
...
...
modules/gui/wxwindows/fileinfo.cpp
View file @
b0ef07a7
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* fileinfo.cpp : wxWindows plugin for vlc
* fileinfo.cpp : wxWindows plugin for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* Copyright (C) 2000-2001 VideoLAN
* $Id: fileinfo.cpp,v 1.1
5 2003/06/05 21:22:27 gbazin
Exp $
* $Id: fileinfo.cpp,v 1.1
6 2003/06/09 19:08:33 asmax
Exp $
*
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
*
...
@@ -117,7 +117,7 @@ void FileInfo::UpdateFileInfo()
...
@@ -117,7 +117,7 @@ void FileInfo::UpdateFileInfo()
{
{
input_thread_t
*
p_input
=
p_intf
->
p_sys
->
p_input
;
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
)
if
(
fileinfo_root
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment