Merge pull request #32 from csett86/ffmuc-merge-upstream

Merge from upstream
freifunkMUC · Sep 7, 2021 · 8e484d7 · 8e484d7
2 parents a5200e2 + 03320d0
commit 8e484d7
Show file tree

Hide file tree

Showing 5 changed files with 218 additions and 410 deletions.
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -22,7 +22,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
       with:
-        node-version: '13'
+        node-version: '12.x'
     - name: Install robotjs dependencies for ubuntu
       run: sudo apt install libxtst-dev libpng++-dev
       if: startsWith(matrix.os, 'ubuntu')

diff --git a/main.js b/main.js
@@ -38,7 +38,9 @@ app.commandLine.appendSwitch('disable-features', 'IOSurfaceCapturer');
 app.commandLine.appendSwitch('force-fieldtrials', 'WebRTC-Audio-Red-For-Opus/Enabled/');
 
 // Enable optional PipeWire support.
-app.commandLine.appendSwitch('enable-features', 'WebRTCPipeWireCapturer');
+if (!app.commandLine.hasSwitch('enable-features')) {
+    app.commandLine.appendSwitch('enable-features', 'WebRTCPipeWireCapturer');
+}
 
 // Needed until robot.js is fixed: https://github.com/octalmage/robotjs/issues/580
 app.allowRendererProcessReuse = false;