smartfridge/armcord
1
1
Fork 0
mirror of https://github.com/smartfrigde/armcord.git synced 2024-08-14 23:56:58 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Redo the Wayland checks for Linux (#327)" (#338)

Browse source 
This reverts commit a66f477af6.
This commit is contained in:
smartfridge 2023-01-24 19:54:18 +01:00 • committed by GitHub
parent a66f477af6
commit f8d7ca68fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/main.ts
View file

@ -25,22 +25,21 @@ if (!app.requestSingleInstanceLock()) {
} else { } else {
// Your data now belongs to CCP // Your data now belongs to CCP
crashReporter.start({uploadToServer: false}); crashReporter.start({uploadToServer: false});
// We use toLowerCase to account for desktops where XDG_SESSION_TYPE might be Wayland and not wayland. if (process.env.USE_WAYLAND == "0") {
if (process.platform.toLowerCase() === "linux" && process.env.XDG_SESSION_TYPE?.toLowerCase() === "wayland") { console.log("Wayland patches disabled.");
// Just using the native Wayland backend doesn't enable PipeWire capture, we need to enable it explicitly. } else {
app.commandLine.appendSwitch('enable-features', 'WebRTCPipeWireCapturer'); if (process.platform == "linux") {
console.log("Wayland detected, using PipeWire for video capture."); if (process.env.XDG_SESSION_TYPE == "wayland") {
// Some people might want to disable the Wayland backend for one reason or another, such as for Wayland-specific bugs. console.log("Wayland specific patches applied.");
if (process.env.USE_WAYLAND === "0") { app.commandLine.appendSwitch("ozone-platform=wayland");
console.log("Wayland backend disabled."); if (process.env.XDG_CURRENT_DESKTOP == "GNOME") {
} else { app.commandLine.appendSwitch("enable-features=UseOzonePlatform,WaylandWindowDecorations");
console.log("Using native Wayland, not Xwayland. Disable with USE_WAYLAND=0 if you find issues."); } else {
app.commandLine.appendSwitch('ozone-platform', 'wayland'); app.commandLine.appendSwitch("enable-features=UseOzonePlatform");
// The Wayland spec doesn't require SSDs, so lets enable self-drawn window decorations. }
// If SSDs are supported on the compositor, Electron will let the compositor handle the decorations. }
app.commandLine.appendSwitch('enable-features', 'UseOzonePlatform,WaylandWindowDecorations');
}
} }
}
checkForDataFolder(); checkForDataFolder();
checkIfConfigExists(); checkIfConfigExists();