Skip to content

Commit

Permalink
fix(changelog): fix modal peers display
Browse files Browse the repository at this point in the history
  • Loading branch information
DEgITx committed Mar 5, 2018
1 parent bf99935 commit fb3a28b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions src/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import injectTapEventPlugin from 'react-tap-event-plugin';
import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';

const { ipcRenderer, remote } = require('electron');
const currentWindow = remote.getCurrentWindow()

//var io = require("socket.io-client");
//window.torrentSocket = io(document.location.protocol + '//' + document.location.hostname + (process.env.NODE_ENV === 'production' ? '/' : ':8095/'));
Expand Down Expand Up @@ -110,9 +111,13 @@ class App extends Component {
<MuiThemeProvider>
<div>
<PagesPie />
<div className='fs0-85 pad0-75' style={{position: 'fixed', bottom: 0, left: 0, color: window.peers > 0 ? 'green' : 'grey'}}>
rats peers: {window.peers} {window.peers > 0 ? ' (p2p rats search enabled)' : ' (p2p rats search not available at this moment)'}
</div>
{
!currentWindow.isModal()
&&
<div className='fs0-85 pad0-75' style={{position: 'fixed', bottom: 0, left: 0, color: window.peers > 0 ? 'green' : 'grey'}}>
rats peers: {window.peers} {window.peers > 0 ? ' (p2p rats search enabled)' : ' (p2p rats search not available at this moment)'}
</div>
}
</div>
</MuiThemeProvider>
);
Expand Down
2 changes: 1 addition & 1 deletion src/background/menu/about_menu_template.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const aboutMenuTemplate = {
slashes: true
}))
win.webContents.on('did-finish-load', () => {
win.send('url', '/changelog')
setTimeout(() => win.send('url', '/changelog'), 0)
});

const handleRedirect = (e, url) => {
Expand Down

0 comments on commit fb3a28b

Please sign in to comment.