Fix possible crash when right click on a Paste Canvas Layer that doesn't have a canva...
authorCarlos Lopez <genetita@gmail.com>
Sun, 29 Aug 2010 08:19:19 +0000 (10:19 +0200)
committerCarlos Lopez <genetita@gmail.com>
Sun, 29 Aug 2010 08:19:19 +0000 (10:19 +0200)
synfig-studio/src/synfigapp/actions/layerparamsetstatic.cpp
synfig-studio/src/synfigapp/actions/layerparamunsetstatic.cpp

index 7676f41..974d3c8 100644 (file)
@@ -102,7 +102,7 @@ Action::LayerParamSetStatic::is_candidate(const ParamList &x)
        //! Retrieves the current parameter
        parameter = _layer->get_param(_param_name);
        //! Check that the parameter is not a inline canvas
-       if(parameter.get_type()==ValueBase::TYPE_CANVAS)
+       if(parameter.get_type()==ValueBase::TYPE_CANVAS && parameter.get(Canvas::Handle()))
                if(parameter.get(Canvas::Handle())->is_inline())
                        return false;
        //! Check if it is already static
index 00fbc10..08cc5f8 100644 (file)
@@ -104,7 +104,7 @@ Action::LayerParamUnSetStatic::is_candidate(const ParamList &x)
        parameter = _layer->get_param(_param_name);
        //! Check that the parameter is not a inline canvas
        if(parameter.get_type()==ValueBase::TYPE_CANVAS)
-               if(parameter.get(Canvas::Handle())->is_inline())
+               if(parameter.get(Canvas::Handle())->is_inline() && parameter.get(Canvas::Handle()))
                        return false;
        //! Check if it is not static
        if(!parameter.get_static())