Merge pull request #38930 from GuidoRevers/fix_vulkan_win_segmentation_fault

Fix segmentation fault when loading project

Merge pull request #38930 from GuidoRevers/fix_vulkan_win_segmentation_fault
eb00dad0 · Rémi Verschelde · GitHub · 92394120 · cf20c034 · eb00dad0
Unverified Commit eb00dad0 authored May 22, 2020 by Rémi Verschelde Committed by GitHub May 22, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 12 deletions

display_server_windows.cpp platform/windows/display_server_windows.cpp +12 -12

No files found.
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -3074,18 +3074,6 @@ DisplayServerWindows::~DisplayServerWindows() {

 	cursors_cache.clear();

-#if defined(VULKAN_ENABLED)
-	if (rendering_driver == "vulkan") {
-		if (rendering_device_vulkan) {
-			rendering_device_vulkan->finalize();
-			memdelete(rendering_device_vulkan);
-		}
-
-		if (context_vulkan)
-			memdelete(context_vulkan);
-	}
-#endif
-
 	if (user_proc) {
 		SetWindowLongPtr(windows[MAIN_WINDOW_ID].hWnd, GWLP_WNDPROC, (LONG_PTR)user_proc);
 	};
@@ -3102,4 +3090,16 @@ DisplayServerWindows::~DisplayServerWindows() {
 		}
 		DestroyWindow(windows[MAIN_WINDOW_ID].hWnd);
 	}
+
+#if defined(VULKAN_ENABLED)
+	if (rendering_driver == "vulkan") {
+		if (rendering_device_vulkan) {
+			rendering_device_vulkan->finalize();
+			memdelete(rendering_device_vulkan);
+		}
+
+		if (context_vulkan)
+			memdelete(context_vulkan);
+	}
+#endif
 }