Fix bug clicking sample not assigned to puck
This commit is contained in:
@@ -364,7 +364,9 @@ public class BasePlatePanel extends DevicePanel {
|
||||
|
||||
void selectSample(Sample sample){
|
||||
if (getSelectionMode()==SelectionMode.Samples){
|
||||
sample.setSelected(true);
|
||||
if (sample!=null){
|
||||
sample.setSelected(true);
|
||||
}
|
||||
Controller.getInstance().onSamplePressed(sample);
|
||||
repaint();
|
||||
}
|
||||
@@ -404,7 +406,11 @@ public class BasePlatePanel extends DevicePanel {
|
||||
|
||||
void selectPuck(Puck puck){
|
||||
if (getSelectionMode()!=SelectionMode.None){
|
||||
puck.setSelected(true);
|
||||
if (puck != null){
|
||||
puck.setSelected(true);
|
||||
} else {
|
||||
getDevice().resetSelection();
|
||||
}
|
||||
Controller.getInstance().onPuckPressed(puck);
|
||||
repaint();
|
||||
}
|
||||
|
||||
@@ -592,7 +592,7 @@ public class Controller {
|
||||
}
|
||||
|
||||
void onSamplePressed(Sample sample) {
|
||||
onPuckPressed(sample.getPuck());
|
||||
onPuckPressed((sample==null)? null : sample.getPuck());
|
||||
}
|
||||
|
||||
void onSampleReleased(Sample sample) {
|
||||
|
||||
Reference in New Issue
Block a user