Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to hide tray icon on non-Mac (which has no tray icon) #11258

Merged
merged 4 commits into from
Oct 30, 2019
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert icon path change
t3chguy committed Oct 29, 2019

Unverified

This user has not yet uploaded their public signing key.
commit 4b0fa940bbaac66e1607fb17b38b58daa8e3ac96
2 changes: 1 addition & 1 deletion electron_app/src/electron-main.js
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ global.minimizeToTray = global.showTrayIcon && store.get('minimizeToTray', true)

// It's important to call `path.join` so we don't end up with the packaged asar in the final path.
const iconFile = `riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
const iconPath = path.join(__dirname, "..", "img", iconFile);
const iconPath = path.join(__dirname, "..", "..", "img", iconFile);
t3chguy marked this conversation as resolved.
Show resolved Hide resolved
const trayConfig = {
icon_path: iconPath,
brand: vectorConfig.brand || 'Riot',