Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Copy system info to clipboard + Update bug_report.yml

Browse source 
plus minor static-related fixes
* linuxbsd: get_systemd_os_release_info_value() -> static breaks usage if used multiple times
* windows/linuxbsd: get_video_adapter_driver_info() writes info into static
* linuxbsd: get_distribution_name() + get_version() -> write bsd fallback into static variable
* windows/uwp/android: remove unnecessary use of static
This commit is contained in:
MJacred 2023-05-27 18:21:23 +02:00
parent 809a982162
commit 9e5bf3d589
7 changed files with 141 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
platform/windows/os_windows.cpp
View file

@ -453,14 +453,19 @@ Vector<String> OS_Windows::get_video_adapter_driver_info() const {
return Vector<String>();
}
static Vector<String> info;
if (!info.is_empty()) {
return info;
}
REFCLSID clsid = CLSID_WbemLocator; // Unmarshaler CLSID
REFIID uuid = IID_IWbemLocator; // Interface UUID
IWbemLocator *wbemLocator = NULL; // to get the services
IWbemServices *wbemServices = NULL; // to get the class
IEnumWbemClassObject *iter = NULL;
IWbemClassObject *pnpSDriverObject[1]; // contains driver name, version, etc.
static String driver_name;
static String driver_version;
String driver_name;
String driver_version;
const String device_name = RenderingServer::get_singleton()->get_rendering_device()->get_device_name();
if (device_name.is_empty()) {
@ -536,7 +541,6 @@ Vector<String> OS_Windows::get_video_adapter_driver_info() const {
SAFE_RELEASE(wbemServices)
SAFE_RELEASE(iter)
Vector<String> info;
info.push_back(driver_name);
info.push_back(driver_version);