From e0fd38e1211c0bf284264473ba2e7bf0774fb095 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Sat, 21 Oct 2017 00:19:13 -0400
Subject: [PATCH] favicon

---
 app.js   | 4 ++--
 index.js | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 0ad632c7e..293a5bf25 100644
--- a/app.js
+++ b/app.js
@@ -56,8 +56,8 @@ app.use(session({
         path: '../trilium-data/sessions'
     })
 }));
-// uncomment after placing your favicon in /public
-//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
+
+app.use(favicon(__dirname + '/public/images/app-icons/favicon.ico'));
 
 app.use('/', indexRoute);
 app.use('/login', loginRoute);
diff --git a/index.js b/index.js
index 85950e1f2..49c2298b0 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,6 @@
 'use strict';
 const electron = require('electron');
+const path = require('path');
 
 const app = electron.app;
 
@@ -18,7 +19,8 @@ function onClosed() {
 function createMainWindow() {
     const win = new electron.BrowserWindow({
         width: 1200,
-        height: 900
+        height: 900,
+        icon: path.join(__dirname, 'public/images/app-icons/png/256x256.png')
     });
 
     win.setMenu(null);