VesperOS/gnome-shell-extensions
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

places-menu: null-check g_volume_get_identifier()

Browse Source 
Not all volumes have the 'class' identifier (for example MTP doesn't),
and we can't apply indexOf on null.
This commit is contained in:
Giovanni Campagna
2013-06-17 21:36:56 +02:00
parent d5ca1ab497
commit fa30f93615
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/places-menu/placeDisplay.js
View File

@@ -292,8 +292,9 @@ const PlacesManager = new Lang.Class({
let volumes = drives[i].get_volumes();
for(let j = 0; j < volumes.length; j++) {
if (volumes[j].get_identifier('class').indexOf('network') >= 0) {
networkVolumes.push(volumes[i]);
let identifier = volumes[j].get_identifier('class');
if (identifier && identifier.indexOf('network') >= 0) {
networkVolumes.push(volumes[j]);
} else {
let mount = volumes[j].get_mount();
if(mount != null)
@@ -308,7 +309,8 @@ const PlacesManager = new Lang.Class({
if(volumes[i].get_drive() != null)
continue;
if (volumes[i].get_identifier('class').indexOf('network') >= 0) {
let identifier = volumes[i].get_identifier('class');
if (identifier && identifier.indexOf('network') >= 0) {
networkVolumes.push(volumes[i]);
} else {
let mount = volumes[i].get_mount();