feat(patchbay): check for has_pipewire to avoid segfault on user error

Vencord · Oct 14, 2023 · abc0b32 · abc0b32
1 parent 4e14a01
commit abc0b32
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/patchbay.cpp b/src/patchbay.cpp
@@ -30,12 +30,17 @@ namespace vencord
     {
         static std::unique_ptr<patchbay> instance;
 
-        if (!instance)
+        if (instance)
         {
-            instance = std::unique_ptr<patchbay>(new patchbay);
+            return *instance;
         }
 
-        return *instance;
+        if (!has_pipewire())
+        {
+            throw std::runtime_error("Not running PipeWire");
+        }
+
+        return *(instance = std::unique_ptr<patchbay>(new patchbay));
     }
 
     bool patchbay::has_pipewire()

diff --git a/tests/node/api.test.js b/tests/node/api.test.js
@@ -19,5 +19,5 @@ catch (error)
     console.warn("No PipeWire Server available");
 
     assert(!venmic.PatchBay.hasPipeWire());
-    assert.throws(() => new venmic.PatchBay(), /failed to create patchbay/ig);
+    assert.throws(() => new venmic.PatchBay(), /(failed to create patchbay)|(not running pipewire)/ig);
 }