Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
3a6a1ce0
Commit
3a6a1ce0
authored
Dec 11, 2003
by
Cyril Deguet
Browse files
* solved race conditions issues when the OpenSkin dialog is
opened in blocking mode
parent
5ad2df4f
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/gui/skins/src/dialogs.cpp
View file @
3a6a1ce0
...
...
@@ -2,7 +2,7 @@
* dialogs.cpp: Handles all the different dialog boxes we provide.
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: dialogs.cpp,v 1.1
6
2003/1
0
/1
5 12:24:14 gbazin
Exp $
* $Id: dialogs.cpp,v 1.1
7
2003/1
2
/1
1 02:26:03 asmax
Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
...
...
@@ -176,6 +176,9 @@ void Dialogs::ShowOpenSkin( bool b_block )
vlc_cond_wait
(
&
p_arg
->
wait
,
&
p_arg
->
lock
);
}
vlc_mutex_unlock
(
&
p_arg
->
lock
);
vlc_mutex_destroy
(
&
p_arg
->
lock
);
vlc_cond_destroy
(
&
p_arg
->
wait
);
free
(
p_arg
);
}
}
}
...
...
modules/gui/wxwindows/dialogs.cpp
View file @
3a6a1ce0
...
...
@@ -2,7 +2,7 @@
* dialogs.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: dialogs.cpp,v 1.1
1
2003/1
1
/1
0
0
0:14:05 gbazin
Exp $
* $Id: dialogs.cpp,v 1.1
2
2003/1
2
/1
1
0
2:26:03 asmax
Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
...
...
@@ -243,15 +243,8 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
vlc_mutex_lock
(
&
p_arg
->
lock
);
p_arg
->
b_ready
=
1
;
vlc_cond_signal
(
&
p_arg
->
wait
);
vlc_mutex_unlock
(
&
p_arg
->
lock
);
}
/* Clean-up */
if
(
p_arg
->
b_blocking
)
{
vlc_mutex_destroy
(
&
p_arg
->
lock
);
vlc_cond_destroy
(
&
p_arg
->
wait
);
}
if
(
p_arg
->
psz_results
)
{
for
(
int
i
=
0
;
i
<
p_arg
->
i_results
;
i
++
)
...
...
@@ -262,7 +255,15 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
}
if
(
p_arg
->
psz_title
)
free
(
p_arg
->
psz_title
);
if
(
p_arg
->
psz_extensions
)
free
(
p_arg
->
psz_extensions
);
free
(
p_arg
);
if
(
p_arg
->
b_blocking
)
{
vlc_mutex_unlock
(
&
p_arg
->
lock
);
}
else
{
free
(
p_arg
);
}
}
void
DialogsProvider
::
OnOpenFileSimple
(
wxCommandEvent
&
event
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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