#define API_ENTRY \
EINA_SAFETY_ON_NULL_RETURN(desk); \
- E_Desk_Private *priv = PRI(desk)
+ E_Desk_Private *priv = PRI(desk); \
+ EINA_SAFETY_ON_NULL_RETURN(priv);
#define E_DESK_SMART_DATA_GET(obj, ptr) \
E_Desk_Smart_Data *ptr = evas_object_smart_data_get(obj);
#define API_ENTRY_VAL(ret) \
EINA_SAFETY_ON_NULL_RETURN_VAL(desk, ret); \
- E_Desk_Private *priv = PRI(desk)
+ E_Desk_Private *priv = PRI(desk); \
+ EINA_SAFETY_ON_NULL_RETURN_VAL(priv, ret);
#define E_DESK_SMART_DATA_GET_OR_RETURN(obj, ptr) \
E_DESK_SMART_DATA_GET(obj, ptr); \
E_Desk_Private *priv;
priv = PRI(desk);
+ if(!priv) return;
#ifdef REFACTOR_DESK_AREA
wl_list_remove(&priv->ds_tizen_splitscreen_deactivate.link);