xMerge branch 'develop' of https://github.com/nicolargo/glances into develop

This commit is contained in:
nicolargo 2019-04-22 17:19:45 +02:00
commit b9d37ecaf2
3 changed files with 5 additions and 5 deletions

View File

@ -78,10 +78,10 @@ export default function GlancesPluginProcesslistController($scope, GlancesStats,
process.cmdline = process.name; process.cmdline = process.name;
} }
if (data.isWindows) { if (data.isWindows && process.username !== null) {
process.username = _.last(process.username.split('\\')); process.username = _.last(process.username.split('\\'));
} }
vm.processes.push(process); vm.processes.push(process);
} }
} }

View File

@ -41949,10 +41949,10 @@ function GlancesPluginProcesslistController($scope, GlancesStats, GlancesPluginH
process.cmdline = process.name; process.cmdline = process.name;
} }
if (data.isWindows) { if (data.isWindows && process.username !== null) {
process.username = _.last(process.username.split('\\')); process.username = _.last(process.username.split('\\'));
} }
vm.processes.push(process); vm.processes.push(process);
} }
} }

File diff suppressed because one or more lines are too long