From b02a61538df09d7ba41352e51f6810a056b2a590 Mon Sep 17 00:00:00 2001
From: TheGoddessInari <thegoddessinari@gmail.com>
Date: Sun, 17 Feb 2019 12:46:23 -0800
Subject: [PATCH] Use path.join for icons.

---
 electron/main.js | 4 ++--
 electron/menu.js | 3 ++-
 electron/tray.js | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/electron/main.js b/electron/main.js
index 7664f173..93bd9941 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -80,7 +80,7 @@ function createWindow () {
 	// Create the browser window using the state information
 	mainWindow = new BrowserWindow({
 		 title: 'Rambox-OS'
-		,icon: app.getAppPath() + '/resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico')
+		,icon: path.join(app.getAppPath(), '/resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico'))
 		,backgroundColor: '#FFF'
 		,x: config.get('x')
 		,y: config.get('y')
@@ -375,7 +375,7 @@ ipcMain.on('image:popup', function(event, url, partition) {
 		 width: mainWindow.getBounds().width
 		,height: mainWindow.getBounds().height
 		,parent: mainWindow
-		,icon: app.getAppPath() + '/resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico')
+		,icon: path.join(app.getAppPath(), '/resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico'))
 		,backgroundColor: '#FFF'
 		,autoHideMenuBar: true
 		,skipTaskbar: true
diff --git a/electron/menu.js b/electron/menu.js
index b40a037b..74a9fa79 100644
--- a/electron/menu.js
+++ b/electron/menu.js
@@ -1,6 +1,7 @@
 'use strict';
 const os = require('os');
 const {app, BrowserWindow, Menu, shell}  = require('electron');
+const path = require('path');
 const appName = app.getName();
 
 function sendAction(action) {
@@ -14,7 +15,7 @@ function sendAction(action) {
 }
 
 module.exports = function(config) {
-	const locale = require(app.getAppPath()+'/resources/languages/'+config.get('locale'));
+	const locale = require(path.join(app.getAppPath(), '/resources/languages/'+config.get('locale')));
 	const helpSubmenu = [
 		{
 			label: `&Facebook`,
diff --git a/electron/tray.js b/electron/tray.js
index 7923f2d3..5eed76bc 100644
--- a/electron/tray.js
+++ b/electron/tray.js
@@ -10,7 +10,7 @@ var appIcon = null;
 exports.create = function(win, config) {
 	if (process.platform === 'darwin' || appIcon || config.get('window_display_behavior') === 'show_taskbar' ) return;
 
-	const locale = require(app.getAppPath()+'/resources/languages/'+config.get('locale'));
+	const locale = require(path.join(app.getAppPath(), '/resources/languages/'+config.get('locale')));
 	const icon = process.platform === 'linux' || process.platform === 'darwin' ? 'IconTray.png' : 'Icon.ico';
 	const iconPath = path.join(app.getAppPath(), `/resources/${icon}`);