Browse Source

Merge pull request #103286 from AThousandShips/fix_windows_display_2

[Windows] Fix unreachable code in `DisplayServer`
Thaddeus Crews 6 months ago
parent
commit
6ea7798789
1 changed files with 4 additions and 4 deletions
  1. 4 4
      servers/display_server.cpp

+ 4 - 4
servers/display_server.cpp

@@ -1344,9 +1344,8 @@ bool DisplayServer::is_rendering_device_supported() {
 		return true;
 	} else {
 		supported_rendering_device = RenderingDeviceCreationStatus::FAILURE;
-		return false;
 	}
-#endif
+#else // WINDOWS_ENABLED
 
 	RenderingContextDriver *rcd = nullptr;
 
@@ -1391,6 +1390,7 @@ bool DisplayServer::is_rendering_device_supported() {
 		rcd = nullptr;
 	}
 
+#endif // WINDOWS_ENABLED
 #endif // RD_ENABLED
 	return false;
 }
@@ -1427,9 +1427,8 @@ bool DisplayServer::can_create_rendering_device() {
 		return true;
 	} else {
 		created_rendering_device = RenderingDeviceCreationStatus::FAILURE;
-		return false;
 	}
-#endif
+#else // WINDOWS_ENABLED
 
 	RenderingContextDriver *rcd = nullptr;
 
@@ -1474,6 +1473,7 @@ bool DisplayServer::can_create_rendering_device() {
 		rcd = nullptr;
 	}
 
+#endif // WINDOWS_ENABLED
 #endif // RD_ENABLED
 	return false;
 }