From 3f9578dc332f0d5a7464b4d8a08117d35e4df071 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Tue, 7 Jul 2015 23:51:27 -0700
Subject: [PATCH] UI: Make sure aero resets if settings cancelled

Fixes a bug where pressing "Cancel" on the settings window would not
reset aero to its original state.
---
 obs/window-basic-settings.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp
index 8bbba9d89..957bd5bf7 100644
--- a/obs/window-basic-settings.cpp
+++ b/obs/window-basic-settings.cpp
@@ -2296,8 +2296,13 @@ void OBSBasicSettings::on_buttonBox_clicked(QAbstractButton *button)
 
 	if (val == QDialogButtonBox::AcceptRole ||
 	    val == QDialogButtonBox::RejectRole) {
-		if (val == QDialogButtonBox::RejectRole)
+		if (val == QDialogButtonBox::RejectRole) {
 			App()->SetTheme(savedTheme);
+#ifdef _WIN32
+			if (toggleAero)
+				SetAeroEnabled(!aeroWasDisabled);
+#endif
+		}
 		ClearChanged();
 		close();
 	}