From 171d6c563ada48e3b76ded48c349e0bc084cffa4 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Fri, 14 Sep 2018 15:34:07 +1200
Subject: [PATCH] Fixed full-screen issue

---
 desktop/main.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/desktop/main.js b/desktop/main.js
index 43d3c47..c721545 100644
--- a/desktop/main.js
+++ b/desktop/main.js
@@ -5,8 +5,6 @@ const shell = require('electron').shell
 
 let is_shown = true;
 
-app.win = null;
-
 app.on('ready', () => 
 {
   app.win = new BrowserWindow({
@@ -52,8 +50,6 @@ app.on('ready', () =>
   })
 })
 
-
-
 app.inspect = function()
 {
   app.win.toggleDevTools();
@@ -66,12 +62,20 @@ app.toggle_fullscreen = function()
 
 app.toggle_visible = function()
 {
-  if(is_shown){ app.win.hide(); } else{ app.win.show(); }
+  if(process.platform == "win32"){
+    if(!app.win.isMinimized()){ app.win.minimize(); } else{ app.win.restore(); }
+  }
+  else{
+    if(is_shown && !app.win.isFullScreen()){ app.win.hide(); } else{ app.win.show(); }
+  }
 }
 
-app.inject_menu = function(m)
+app.inject_menu = function(menu)
 {
-  if(process.platform == "win32"){ return; }
-
-  Menu.setApplicationMenu(Menu.buildFromTemplate(m));
+  try{
+    Menu.setApplicationMenu(Menu.buildFromTemplate(menu));
+  }
+  catch(err){
+    console.warn("Cannot inject menu.")
+  }  
 }
\ No newline at end of file