From b0e12c3392f4fdc2635f5aaed970edfb98ef6313 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 22 Apr 2015 20:18:54 -0700
Subject: [PATCH] Qt: Fix a load of uninitialized members

---
 src/platform/qt/AudioDevice.cpp       | 3 ++-
 src/platform/qt/AudioProcessor.cpp    | 2 ++
 src/platform/qt/AudioProcessorQt.cpp  | 4 ++++
 src/platform/qt/AudioProcessorSDL.cpp | 4 ++++
 src/platform/qt/Display.cpp           | 4 ++++
 src/platform/qt/KeyEditor.cpp         | 1 +
 src/platform/qt/LoadSaveState.h       | 1 -
 src/platform/qt/LogView.cpp           | 5 +++--
 8 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/platform/qt/AudioDevice.cpp b/src/platform/qt/AudioDevice.cpp
index 8d0ff8c44..d07c4a0a8 100644
--- a/src/platform/qt/AudioDevice.cpp
+++ b/src/platform/qt/AudioDevice.cpp
@@ -17,12 +17,13 @@ AudioDevice::AudioDevice(QObject* parent)
 	: QIODevice(parent)
 	, m_context(nullptr)
 	, m_drift(0)
+	, m_ratio(1.f)
 {
 	setOpenMode(ReadOnly);
 }
 
 void AudioDevice::setFormat(const QAudioFormat& format) {
-	if (!GBAThreadIsActive(m_context)) {
+	if (!m_context || !GBAThreadIsActive(m_context)) {
 		return;
 	}
 #if RESAMPLE_LIBRARY == RESAMPLE_NN
diff --git a/src/platform/qt/AudioProcessor.cpp b/src/platform/qt/AudioProcessor.cpp
index 47c698eee..6c58e2c39 100644
--- a/src/platform/qt/AudioProcessor.cpp
+++ b/src/platform/qt/AudioProcessor.cpp
@@ -48,6 +48,8 @@ AudioProcessor* AudioProcessor::create() {
 
 AudioProcessor::AudioProcessor(QObject* parent)
 	: QObject(parent)
+	, m_context(nullptr)
+	, m_samples(GBA_AUDIO_SAMPLES)
 {
 }
 
diff --git a/src/platform/qt/AudioProcessorQt.cpp b/src/platform/qt/AudioProcessorQt.cpp
index eb8f1ff14..b16a50981 100644
--- a/src/platform/qt/AudioProcessorQt.cpp
+++ b/src/platform/qt/AudioProcessorQt.cpp
@@ -33,6 +33,10 @@ void AudioProcessorQt::setInput(GBAThread* input) {
 }
 
 void AudioProcessorQt::start() {
+	if (!input()) {
+		return;
+	}
+
 	if (!m_device) {
 		m_device = new AudioDevice(this);
 	}
diff --git a/src/platform/qt/AudioProcessorSDL.cpp b/src/platform/qt/AudioProcessorSDL.cpp
index f52188f4a..ff88cb376 100644
--- a/src/platform/qt/AudioProcessorSDL.cpp
+++ b/src/platform/qt/AudioProcessorSDL.cpp
@@ -22,6 +22,10 @@ AudioProcessorSDL::~AudioProcessorSDL() {
 }
 
 void AudioProcessorSDL::start() {
+	if (!input()) {
+		return;
+	}
+
 	if (m_audio.thread) {
 		GBASDLResumeAudio(&m_audio);
 	} else {
diff --git a/src/platform/qt/Display.cpp b/src/platform/qt/Display.cpp
index 9370c2a3d..ba62ca037 100644
--- a/src/platform/qt/Display.cpp
+++ b/src/platform/qt/Display.cpp
@@ -32,6 +32,9 @@ Display::Display(QGLFormat format, QWidget* parent)
 	: QGLWidget(format, parent)
 	, m_painter(nullptr)
 	, m_started(false)
+	, m_lockAspectRatio(false)
+	, m_filter(false)
+	, m_context(nullptr)
 {
 	setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 	setMinimumSize(VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS);
@@ -145,6 +148,7 @@ Painter::Painter(Display* parent)
 	: m_gl(parent)
 	, m_lockAspectRatio(false)
 	, m_filter(false)
+	, m_context(nullptr)
 {
 	m_size = parent->size();
 }
diff --git a/src/platform/qt/KeyEditor.cpp b/src/platform/qt/KeyEditor.cpp
index dcf15961b..fd76b2def 100644
--- a/src/platform/qt/KeyEditor.cpp
+++ b/src/platform/qt/KeyEditor.cpp
@@ -15,6 +15,7 @@ using namespace QGBA;
 KeyEditor::KeyEditor(QWidget* parent)
 	: QLineEdit(parent)
 	, m_direction(GamepadAxisEvent::NEUTRAL)
+	, m_button(false)
 {
 	setAlignment(Qt::AlignCenter);
 }
diff --git a/src/platform/qt/LoadSaveState.h b/src/platform/qt/LoadSaveState.h
index b1ba156e1..b5aa09c59 100644
--- a/src/platform/qt/LoadSaveState.h
+++ b/src/platform/qt/LoadSaveState.h
@@ -47,7 +47,6 @@ private:
 
 	Ui::LoadSaveState m_ui;
 	GameController* m_controller;
-	InputController* m_inputController;
 	SavestateButton* m_slots[NUM_SLOTS];
 	LoadSave m_mode;
 
diff --git a/src/platform/qt/LogView.cpp b/src/platform/qt/LogView.cpp
index 883eab3ce..41b8cc4d6 100644
--- a/src/platform/qt/LogView.cpp
+++ b/src/platform/qt/LogView.cpp
@@ -12,6 +12,9 @@ using namespace QGBA;
 
 LogView::LogView(QWidget* parent)
 	: QWidget(parent)
+	, m_logLevel(0)
+	, m_lines(0)
+	, m_lineLimit(DEFAULT_LINE_LIMIT)
 {
 	m_ui.setupUi(this);
 	connect(m_ui.levelDebug, SIGNAL(toggled(bool)), this, SLOT(setLevelDebug(bool)));
@@ -24,8 +27,6 @@ LogView::LogView(QWidget* parent)
 	connect(m_ui.levelSWI, SIGNAL(toggled(bool)), this, SLOT(setLevelSWI(bool)));
 	connect(m_ui.clear, SIGNAL(clicked()), this, SLOT(clear()));
 	connect(m_ui.maxLines, SIGNAL(valueChanged(int)), this, SLOT(setMaxLines(int)));
-	m_logLevel = 0;
-	m_lines = 0;
 	m_ui.maxLines->setValue(DEFAULT_LINE_LIMIT);
 }