Ticket #1170: opensync_obj_engine.patch

File opensync_obj_engine.patch, 852 bytes (added by henrik, 3 years ago)
  • opensync_obj_engine.c

     
    311311                        osync_trace(TRACE_INTERNAL, "Member1-caps: %p Member2-caps: %p", caps1, caps2); 
    312312 
    313313                        if (caps1) { 
    314                                 clone_change1 = _osync_obj_engine_clone_and_demerge_change(sinkengine->engine, caps1, change2, error); 
     314                                clone_change1 = _osync_obj_engine_clone_and_demerge_change(sinkengine->engine, caps1, change1, error); 
    315315                                if (!clone_change1) 
    316316                                        goto error; 
    317317 
    318318                        } 
    319319 
    320320                        if (caps2) { 
    321                                 clone_change2 = _osync_obj_engine_clone_and_demerge_change(sinkengine->engine, caps2, change1, error); 
     321                                clone_change2 = _osync_obj_engine_clone_and_demerge_change(sinkengine->engine, caps2, change2, error); 
    322322                                if (!clone_change2) 
    323323                                        goto error; 
    324324