From b92934fedcdc38d89a5e5c42cba712cf327b9f2a Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 12 Nov 2015 15:06:29 +0100 Subject: [PATCH] Edit mode: fix bug when XDG_DATA_DIRS is empty --- src/store/actions/edit.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/store/actions/edit.js b/src/store/actions/edit.js index 91000e7..daadaed 100644 --- a/src/store/actions/edit.js +++ b/src/store/actions/edit.js @@ -28,12 +28,20 @@ exports.loadDesktopApps = function() { logger.info('Loading desktop apps...'); - var baseDirs = global.process.env.XDG_DATA_DIRS.split(':').map(function(baseDir){ + dispatch({ type: LOAD_DESKTOP_APPS }); + + var xdgDataDirs = global.process.env.XDG_DATA_DIRS; + + if( !xdgDataDirs ) { + logger.warn('The environment variable XDG_DATA_DIRS is empty. Can\'t find any application.'); + dispatch({ type: LOAD_DESKTOP_APPS_SUCCESS, desktopApps: [] }); + return; + } + + var baseDirs = xdgDataDirs.split(':').map(function(baseDir){ return path.join(baseDir, 'applications'); }); - dispatch({ type: LOAD_DESKTOP_APPS }); - return Util.DesktopApps.loadAllDesktopFiles(baseDirs) .then(function(desktopApps) { logger.info('Desktop apps loaded.');