Merge branch 'master' into dev

2016-04-14 21:21:52 +09:00
parent 3097da1b88 af48bce17b
commit c3783445fa
7 changed files with 31 additions and 12 deletions
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -17,7 +17,7 @@ const ListGroupItem = ReactBootstrap.ListGroupItem;
 const Glyphicon = ReactBootstrap.Glyphicon;

 function backToIndex() {
-  window.location = 'index.html';
+  remote.getCurrentWindow().loadURL('file://' + __dirname + '/index.html');
 }

 var SettingsPage = React.createClass({