Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
1a14e109
Commit
1a14e109
authored
Feb 06, 2010
by
dionoea
Browse files
Fix lua intf thread cancellation and cleanup properly in vlc.net.poll().
parent
f135a526
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/misc/lua/intf.c
View file @
1a14e109
...
...
@@ -312,6 +312,8 @@ void Close_LuaIntf( vlc_object_t *p_this )
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
p_this
;
intf_sys_t
*
p_sys
=
p_intf
->
p_sys
;
vlc_cancel
(
p_sys
->
thread
);
vlc_mutex_lock
(
&
p_sys
->
lock
);
p_sys
->
exiting
=
true
;
vlc_cond_signal
(
&
p_sys
->
wait
);
...
...
modules/misc/lua/libs/net.c
View file @
1a14e109
...
...
@@ -194,6 +194,7 @@ static int vlclua_net_poll( lua_State *L )
lua_pop
(
L
,
1
);
}
struct
pollfd
*
p_fds
=
malloc
(
i_fds
*
sizeof
(
struct
pollfd
)
);
vlc_cleanup_push
(
free
,
p_fds
);
lua_pushnil
(
L
);
int
i
=
0
;
while
(
lua_next
(
L
,
1
)
)
...
...
@@ -212,8 +213,8 @@ static int vlclua_net_poll( lua_State *L )
lua_pushinteger
(
L
,
p_fds
[
i
].
revents
);
lua_settable
(
L
,
1
);
}
free
(
p_fds
);
lua_pushinteger
(
L
,
i_ret
);
vlc_cleanup_run
();
return
1
;
}
...
...
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