From 81f38fd76f8a0d1db377243e0e69f568118dde1f Mon Sep 17 00:00:00 2001
From: waddlesplash <waddlesplash@gmail.com>
Date: Sun, 2 Apr 2017 17:17:52 -0400
Subject: [PATCH 1/4] SDL: Fix build on MSVC.

---
 src/platform/sdl/CMakeLists.txt | 1 -
 src/platform/sdl/main.c         | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt
index f4b4c37b9..9a653fcc3 100644
--- a/src/platform/sdl/CMakeLists.txt
+++ b/src/platform/sdl/CMakeLists.txt
@@ -6,7 +6,6 @@ if (SDL_VERSION EQUAL "2")
 	if (SDL2_FOUND)
 		set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIRS})
 		set(SDL_LIBRARY ${SDL2_LIBRARIES})
-		set(SDLMAIN_LIBRARY "")
 		link_directories(${SDL2_LIBDIR})
 		set(SDL_VERSION_DEBIAN "2-2.0-0")
 	endif()
diff --git a/src/platform/sdl/main.c b/src/platform/sdl/main.c
index 24e0353c2..33aaf0b01 100644
--- a/src/platform/sdl/main.c
+++ b/src/platform/sdl/main.c
@@ -27,7 +27,6 @@
 
 #include <errno.h>
 #include <signal.h>
-#include <sys/time.h>
 
 #define PORT "sdl"
 
@@ -37,7 +36,7 @@ static void mSDLDeinit(struct mSDLRenderer* renderer);
 static int mSDLRun(struct mSDLRenderer* renderer, struct mArguments* args);
 
 int main(int argc, char** argv) {
-	struct mSDLRenderer renderer = {};
+	struct mSDLRenderer renderer = {0};
 
 	struct mCoreOptions opts = {
 		.useBios = true,

From 2fbd31c51a1ef7c0976b3205e524d51d604d78d1 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Wed, 5 Apr 2017 13:17:11 -0700
Subject: [PATCH 2/4] Qt: Make "Mute" able to be bound to a key (fixes #559)

---
 CHANGES                    | 1 +
 src/platform/qt/Window.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index c7080c30d..94459b0c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -83,6 +83,7 @@ Misc:
  - Qt: Re-enable QtMultimedia on Windows
  - FFmpeg: Return false if a file fails to open
  - FFmpeg: Force MP4 files to YUV420P
+ - Qt: Make "Mute" able to be bound to a key
 
 0.5.2: (2016-12-31)
 Bugfixes:
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 76756e628..b3b15f909 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -1266,11 +1266,12 @@ void Window::setupMenu(QMenuBar* menubar) {
 	avMenu->addSeparator();
 
 	ConfigOption* mute = m_config->addOption("mute");
-	mute->addBoolean(tr("Mute"), avMenu);
+	QAction* muteAction = mute->addBoolean(tr("Mute"), avMenu);
 	mute->connect([this](const QVariant& value) {
 		reloadConfig();
 	}, this);
 	m_config->updateOption("mute");
+	addControlledAction(avMenu, muteAction, "mute");
 
 	QMenu* target = avMenu->addMenu(tr("FPS target"));
 	ConfigOption* fpsTargetOption = m_config->addOption("fpsTarget");

From ee74e4affa976010517ecee674a4f1cac2c9678e Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Thu, 6 Apr 2017 09:27:33 -0700
Subject: [PATCH 3/4] Res: Update patron list

---
 res/patrons.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/patrons.txt b/res/patrons.txt
index e10e13221..0cf2e6e28 100644
--- a/res/patrons.txt
+++ b/res/patrons.txt
@@ -1,7 +1,9 @@
-Trey Boyer
-Christopher Cole
+Jaime J. Denizard
+Fog
+Reilly Grant
 Philip Horton
 Jordan Jorgensen
-Joshua Minor
 Rohit Nirmal
+Rhys Powell
+rootfather
 Yuri Kunde Schlesner

From 19d0ca3b8b63dd25c17539357d09a47b44d2e6db Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Thu, 6 Apr 2017 11:54:13 -0700
Subject: [PATCH 4/4] Qt: Fix crash when changing audio settings after a game
 is closed

---
 CHANGES                            | 1 +
 src/platform/qt/GameController.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 94459b0c1..4607a27b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -35,6 +35,7 @@ Bugfixes:
  - SDL: Fix race condition with audio thread when starting
  - GB: Fix flickering when screen is strobed quickly
  - FFmpeg: Fix overflow and general issues with audio encoding
+ - Qt: Fix crash when changing audio settings after a game is closed
 Misc:
  - SDL: Remove scancode key input
  - GBA Video: Clean up unused timers
diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index bf81defd0..6c73d06e8 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -654,6 +654,7 @@ void GameController::cleanGame() {
 	delete[] m_frontBuffer;
 
 	m_threadContext.core->deinit(m_threadContext.core);
+	m_threadContext.core = nullptr;
 	m_gameOpen = false;
 }
 
@@ -1222,7 +1223,7 @@ void GameController::updateKeys() {
 }
 
 void GameController::redoSamples(int samples) {
-	if (m_threadContext.core) {
+	if (m_gameOpen && m_threadContext.core) {
 		m_threadContext.core->setAudioBufferSize(m_threadContext.core, samples);
 	}
 	m_audioProcessor->inputParametersChanged();