Commit e000378

Nick Faro committed on
Screwed something up in the merge
commit e000378db25fdda50098e8665516bd52b9bccd63 parent decdda7
1 changed files +2−2
Modifiedtrackergrid.pas +2−2
@@ -603,8 +603,8 @@ procedure TTrackerGrid.PerformPaste(Paste: TSelection; Where: TSelectionPos; Mix
603 Cell1.Instrument := Cell2.Cell.Instrument; 603 Cell1.Instrument := Cell2.Cell.Instrument;
604 604
605 if cpVolume in Cell2.Parts then 605 if cpVolume in Cell2.Parts then
606 if (not Mix) or (Cell2.Cell.Volume.Value <> 0) then 606 if (not Mix) or (Cell2.Cell.Volume <> 0) then
607 Cell1.Volume.Value := Cell2.Cell.Volume.Value; 607 Cell1.Volume := Cell2.Cell.Volume;
608 608
609 if cpEffectCode in Cell2.Parts then 609 if cpEffectCode in Cell2.Parts then
610 if (not Mix) or (Cell2.Cell.EffectCode <> 0) then 610 if (not Mix) or (Cell2.Cell.EffectCode <> 0) then