From 7fdb621481239c933d9de5119e2992b8e66a8bca Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 8 Jan 2018 23:23:37 +0100
Subject: [PATCH] Update

---
 gfx/common/win32_common.c | 2 +-
 gfx/drivers/d3d.c         | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 40638b6448..f36543aa8d 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -1196,9 +1196,9 @@ void win32_destroy_window(void)
 {
 #ifndef _XBOX
    UnregisterClass("RetroArch", GetModuleHandle(NULL));
-#endif
 #if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x500 /* 2K */
    UnregisterDeviceNotification(notification_handler);
+#endif
 #endif
    main_window.hwnd = NULL;
 }
diff --git a/gfx/drivers/d3d.c b/gfx/drivers/d3d.c
index 39690acf44..e20de55124 100644
--- a/gfx/drivers/d3d.c
+++ b/gfx/drivers/d3d.c
@@ -1284,9 +1284,7 @@ static void d3d_free(void *data)
    d3d->dev         = NULL;
    g_pD3D           = NULL;
 
-#ifndef _XBOX
    win32_monitor_from_window();
-#endif
 
    if (d3d)
       free(d3d);