From 31055796af204a3e23cea7dacf924ddfa0375edd Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Thu, 18 Nov 2021 22:24:47 +0100
Subject: [PATCH] early-access version 2214

---
 README.md                                      | 2 +-
 src/video_core/vulkan_common/vulkan_device.cpp | 4 ++--
 src/yuzu/main.cpp                              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 652d924a4..1a288c217 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 2212.
+This is the source code for early-access 2214.
 
 ## Legal Notice
 
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index d782af09c..70c52aaac 100755
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -21,7 +21,7 @@
 namespace Vulkan {
 namespace {
 namespace Alternatives {
-constexpr std::array S8_UINT{
+constexpr std::array STENCIL8_UINT{
     VK_FORMAT_D16_UNORM_S8_UINT,
     VK_FORMAT_D24_UNORM_S8_UINT,
     VK_FORMAT_D32_SFLOAT_S8_UINT,
@@ -82,7 +82,7 @@ void SetNext(void**& next, T& data) {
 constexpr const VkFormat* GetFormatAlternatives(VkFormat format) {
     switch (format) {
     case VK_FORMAT_S8_UINT:
-        return Alternatives::S8_UINT.data();
+        return Alternatives::STENCIL8_UINT.data();
     case VK_FORMAT_D24_UNORM_S8_UINT:
         return Alternatives::DEPTH24_UNORM_STENCIL8_UINT.data();
     case VK_FORMAT_D16_UNORM_S8_UINT:
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 5ffa0a27a..e0f3fbaf9 100755
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1037,7 +1037,7 @@ void GMainWindow::InitializeHotkeys() {
             &QShortcut::activatedAmbiguously, ui->action_Fullscreen, &QAction::trigger);
     connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Exit Fullscreen"), this),
             &QShortcut::activated, this, [&] {
-                if (emulation_running) {
+                if (emulation_running && ui->action_Fullscreen->isChecked()) {
                     ui->action_Fullscreen->setChecked(false);
                     ToggleFullscreen();
                 }