Skip to content
Snippets Groups Projects
Commit b357d94a authored by tobias's avatar tobias
Browse files

Fixed midi device lookup bug and midi mapping bug

parent 4e627023
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -112,6 +112,7 @@ 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()));
......
......@@ -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) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment