Try to fix hsG3DDeviceSelector enumerator issues

H-uru · Sep 9, 2023 · 071247d · 071247d
1 parent 163831b
commit 071247d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp b/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp
@@ -243,7 +243,10 @@ hsG3DDeviceModeRecord& hsG3DDeviceModeRecord::operator=(const hsG3DDeviceModeRec
 ///////////////////////////////////////////////////
 ///////////////////////////////////////////////////
 
-std::list<hsG3DDeviceSelector::DeviceEnumerator> hsG3DDeviceSelector::sEnumerators;
+std::list<hsG3DDeviceSelector::DeviceEnumerator>& hsG3DDeviceSelector::Enumerators() {
+    static std::list<hsG3DDeviceSelector::DeviceEnumerator> sEnumerators;
+    return sEnumerators;
+}
 
 hsG3DDeviceSelector::~hsG3DDeviceSelector()
 {
@@ -354,7 +357,7 @@ void hsG3DDeviceSelector::Enumerate(hsWindowHndl winRef)
     ITryDirect3DTnL(winRef);
 #endif
 
-    for (const auto& enumerator : sEnumerators) {
+    for (const auto& enumerator : Enumerators()) {
         enumerator(fRecords);
     }
 }

diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.h b/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.h
@@ -322,7 +322,7 @@ class hsG3DDeviceSelector : public hsRefCnt
     typedef std::function<void(std::vector<hsG3DDeviceRecord>&)> DeviceEnumerator;
 
 protected:
-    static std::list<DeviceEnumerator> sEnumerators;
+    static std::list<DeviceEnumerator>& Enumerators();
 
     std::vector<hsG3DDeviceRecord> fRecords;
     char    fErrorString[ 128 ];
@@ -344,7 +344,7 @@ class hsG3DDeviceSelector : public hsRefCnt
     void    ISetFudgeFactors( uint8_t chipsetID, hsG3DDeviceRecord &record );
 
 public:
-    static void AddDeviceEnumerator(const DeviceEnumerator& de) { sEnumerators.emplace_back(de); }
+    static void AddDeviceEnumerator(const DeviceEnumerator& de) { Enumerators().emplace_back(de); }
 
     hsG3DDeviceSelector() { }
     virtual ~hsG3DDeviceSelector();