From a49f7823b69a3d3cd6695d7cda63146b702cf7d6 Mon Sep 17 00:00:00 2001 From: Matt Jenkins Date: Tue, 11 Sep 2018 11:43:14 +0100 Subject: [PATCH] Put pack and setVisible in the *right* place --- .../majenko/audiobookrecorder/AudiobookRecorder.java | 8 +++----- src/uk/co/majenko/audiobookrecorder/Options.java | 12 ++++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java index e26b5cf..8114f66 100644 --- a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java +++ b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java @@ -178,11 +178,6 @@ public class AudiobookRecorder extends JFrame { setPreferredSize(new Dimension(700, 500)); setLocationRelativeTo(null); - - pack(); - - setVisible(true); - } public AudiobookRecorder() { @@ -512,6 +507,9 @@ public class AudiobookRecorder extends JFrame { centralPanel.add(mainScroll, BorderLayout.CENTER); setTitle("AudioBook Recorder"); + + pack(); + setVisible(true); } public static void main(String args[]) { diff --git a/src/uk/co/majenko/audiobookrecorder/Options.java b/src/uk/co/majenko/audiobookrecorder/Options.java index 63d50c1..5d79c61 100644 --- a/src/uk/co/majenko/audiobookrecorder/Options.java +++ b/src/uk/co/majenko/audiobookrecorder/Options.java @@ -344,10 +344,18 @@ public class Options extends JDialog { KVPair[] recordingMixers = getRecordingMixerList(); KVPair[] playbackMixers = getPlaybackMixerList(); - defaultPrefs.put("audio.recording.device", recordingMixers[0].key); + if (recordingMixers.length > 0) { + defaultPrefs.put("audio.recording.device", recordingMixers[0].key); + } else { + defaultPrefs.put("audio.recording.device", ""); + } defaultPrefs.put("audio.recording.channels", "2"); defaultPrefs.put("audio.recording.samplerate", "48000"); - defaultPrefs.put("audio.playback.device", playbackMixers[0].key); + if (playbackMixers.length > 0) { + defaultPrefs.put("audio.playback.device", playbackMixers[0].key); + } else { + defaultPrefs.put("audio.playback.device", ""); + } defaultPrefs.put("catenation.pre-chapter", "2000"); defaultPrefs.put("catenation.post-chapter", "2000");