* skins2: The Image control now supports the "action2" attribute (feel free to

[vlc] / modules / gui / skins2 / parser / builder.cpp

diff --git a/modules/gui/skins2/parser/builder.cpp b/modules/gui/skins2/parser/builder.cpp
index 4692337e4fa6684ce74b7db8b33210c2de0c4494..555b97a90a6beb2db1e364857d63c16aa2a044a1 100644 (file)
--- a/modules/gui/skins2/parser/builder.cpp
+++ b/modules/gui/skins2/parser/builder.cpp
@@ -461,6 +461,13 @@ void Builder::addImage( const BuilderData::Image &rData )
         return;
     }
 
+    CmdGeneric *pCommand = parseAction( rData.m_action2Id );
+    if( pCommand == NULL )
+    {
+        msg_Err( getIntf(), "Invalid action: %s", rData.m_action2Id.c_str() );
+        return;
+    }
+
     // Get the visibility variable
     // XXX check when it is null
     Interpreter *pInterpreter = Interpreter::instance( getIntf() );
@@ -468,8 +475,8 @@ void Builder::addImage( const BuilderData::Image &rData )
 
     CtrlImage::resize_t resizeMethod =
         (rData.m_resize == "scale" ? CtrlImage::kScale : CtrlImage::kMosaic);
-    CtrlImage *pImage = new CtrlImage( getIntf(), *pBmp, resizeMethod,
-        UString( getIntf(), rData.m_help.c_str() ), pVisible );
+    CtrlImage *pImage = new CtrlImage( getIntf(), *pBmp, *pCommand,
+        resizeMethod, UString( getIntf(), rData.m_help.c_str() ), pVisible );
 
     // Compute the position of the control
     const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,