diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java index c4827e9f996df327ecca9b28d914a655603e085c..fbda591aa744faa54b000b0b47622d76fbd5de94 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java @@ -8,8 +8,8 @@ import org.controlsfx.control.PopOver.ArrowLocation; import de.tobias.playpad.DisplayableColor; import de.tobias.playpad.PlayPadMain; import de.tobias.playpad.design.CartDesign; -import de.tobias.playpad.design.modern.ModernColor; import de.tobias.playpad.design.modern.ModernCartDesign; +import de.tobias.playpad.design.modern.ModernColor; import de.tobias.playpad.view.ColorView; import de.tobias.playpad.viewcontroller.CartDesignViewController; import javafx.event.ActionEvent; diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java index 455ffe0499197e8a09b6163b18b53c08a133bca4..e1a95fd99c0715237e55628ad705584cd4b0a934 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java @@ -112,7 +112,8 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon layoutChangedListener = new LayoutChangedListener(); setMainLayout(new DesktopMainLayoutConnect()); // DEBUG - + initMapper(openProject); + Profile.registerListener(this); reloadSettings(null, Profile.currentProfile()); @@ -382,7 +383,8 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon openProject = project; - initMapper(project); + midiHandler.setProject(project); + keyboardHandler.setProject(project); midiHandler.setProject(project); keyboardHandler.setProject(project); @@ -710,6 +712,7 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon midi.lookupMidiDevice(name); notificationPane.showAndHide(Localization.getString(Strings.Info_Midi_Device_Connected, name), PlayPadMain.displayTimeMillis); } catch (NullPointerException e) { + e.printStackTrace(); showError(Localization.getString(Strings.Error_Midi_Device_Unavailible, name)); } catch (IllegalArgumentException | MidiUnavailableException e) { showError(Localization.getString(Strings.Error_Midi_Device_Busy, e.getLocalizedMessage())); diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/mapper/MidiMapperViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/mapper/MidiMapperViewController.java index 126dc8164e89e64ef7937a0d5145827f208af573..52d5caca51388b4f65b9ec92f0622ee4da70e479 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/mapper/MidiMapperViewController.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/mapper/MidiMapperViewController.java @@ -80,7 +80,7 @@ public class MidiMapperViewController extends MapperViewController implements Mi @FXML private void midiInputRecordButtonHandler(ActionEvent event) { canceled = false; - + currentListener = Midi.getInstance().getListener(); Midi.getInstance().setListener(this); @@ -124,7 +124,7 @@ public class MidiMapperViewController extends MapperViewController implements Mi @Override public boolean showInputMapperUI() { midiInputRecordButtonHandler(null); - return canceled; // TEST Ob das funktioniert mit dem Return + return !canceled; } public void setMapper(MidiMapper midiMapper) {