if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

ELECTRON-445 - Resolved conflicts

Browse Source
This commit is contained in:
Kiran Niranjan 2018-06-05 16:22:42 +05:30
parent 6af47e9fef
commit 984c54ad80
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/memoryMonitor.js
View File

@ -2,7 +2,7 @@
const log = require('./log.js');
const logLevels = require('./enums/logLevels.js');
const { getMainWindow } = require('./windowMgr');
const { getMainWindow, setIsAutoReload } = require('./windowMgr');
const systemIdleTime = require('@paulcbetts/system-idle-time');
const { getConfigField } = require('./config');
@ -69,10 +69,10 @@ function optimizeMemory(memoryInfo, cpuUsage) {
/**
* Sets the current user meeting status
* @param bool - Whether user is in an active meeting
* @param meetingStatus - Whether user is in an active meeting
*/
function setIsInMeeting(bool) {
isInMeeting = bool;
function setIsInMeeting(meetingStatus) {
isInMeeting = meetingStatus;
}
module.exports = {