Merge branch 'master' into lpcm_encoder

[vlc] / modules / misc / lua / libs / dialog.c

diff --git a/modules/misc/lua/libs/dialog.c b/modules/misc/lua/libs/dialog.c
index 66f30a98f1c63d541eeab4681f691de7205784fa..a2e0d14109790f286e5b588aa0fbc587581e8b8c 100644 (file)
--- a/modules/misc/lua/libs/dialog.c
+++ b/modules/misc/lua/libs/dialog.c
@@ -201,7 +201,7 @@ static int vlclua_dialog_create( lua_State *L )
     lua_setfield( L, -2, "__dialog" );
     lua_pop( L, 1 );
 
-    extension_dialog_t **pp_dlg = lua_newuserdata( L, sizeof( void* ) );
+    extension_dialog_t **pp_dlg = lua_newuserdata( L, sizeof( extension_dialog_t* ) );
     *pp_dlg = p_dlg;
 
     if( luaL_newmetatable( L, "dialog" ) )
@@ -577,7 +577,7 @@ end_of_args:
     vlc_mutex_unlock( &p_dlg->lock );
 
     /* Create meta table */
-    extension_widget_t **pp_widget = lua_newuserdata( L, sizeof( void* ) );
+    extension_widget_t **pp_widget = lua_newuserdata( L, sizeof( extension_widget_t* ) );
     *pp_widget = p_widget;
     if( luaL_newmetatable( L, "widget" ) )
     {
@@ -721,6 +721,8 @@ static int vlclua_widget_add_value( lua_State *L )
     if( !p_widget->p_values )
     {
         p_widget->p_values = p_new_value;
+        if( p_widget->type == EXTENSION_WIDGET_DROPDOWN )
+            p_new_value->b_selected = true;
     }
     else
     {