diff --git a/daemon/oshelpers/linux/applist/applist.go b/daemon/oshelpers/linux/applist/applist.go index 4b025168..053b6233 100644 --- a/daemon/oshelpers/linux/applist/applist.go +++ b/daemon/oshelpers/linux/applist/applist.go @@ -55,6 +55,10 @@ func GetAppsList(evXDG_DATA_DIRS string, evXDG_CURRENT_DESKTOP string, evHOME st // parse arguments HOME = evHOME XDG_DATA_DIRS = strings.Split(evXDG_DATA_DIRS, ":") + if len(XDG_DATA_DIRS)==1 && XDG_DATA_DIRS[0]=="" { + XDG_DATA_DIRS = []string{} + } + for _, deskval := range strings.Split(evXDG_CURRENT_DESKTOP, ":") { XDG_CURRENT_DESKTOP[deskval] = struct{}{} } diff --git a/daemon/oshelpers/linux/icotheme/theme.go b/daemon/oshelpers/linux/icotheme/theme.go index f4663a0e..9ebcd4fe 100644 --- a/daemon/oshelpers/linux/icotheme/theme.go +++ b/daemon/oshelpers/linux/icotheme/theme.go @@ -58,6 +58,9 @@ type Theme struct { func GetTheme(themeName string, evHOME string, evXDG_DATA_DIRS string) (Theme, error) { // parse arguments XDG_DATA_DIRS := strings.Split(evXDG_DATA_DIRS, ":") + if len(XDG_DATA_DIRS)==1 && XDG_DATA_DIRS[0]=="" { + XDG_DATA_DIRS = []string{} + } if len(XDG_DATA_DIRS) == 0 { XDG_DATA_DIRS = append(XDG_DATA_DIRS, "/usr/local/share/") XDG_DATA_DIRS = append(XDG_DATA_DIRS, "/usr/share/") @@ -130,7 +133,7 @@ func readTheme(themeName string, iconsBaseDirs []string) (Theme, error) { } } if len(themeFile) <= 0 { - return Theme{}, fmt.Errorf("theme not fpound") + return Theme{}, fmt.Errorf("theme not found") } // reading parents info diff --git a/ui/package-lock.json b/ui/package-lock.json index eaa6049e..e6838b1a 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "ivpn-ui", - "version": "3.5.0", + "version": "3.5.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ivpn-ui", - "version": "3.5.0", + "version": "3.5.1", "hasInstallScript": true, "license": "GPL-3.0", "dependencies": { diff --git a/ui/package.json b/ui/package.json index 6872e691..e52474f3 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "ivpn-ui", - "version": "3.5.0", + "version": "3.5.1", "productName": "IVPN", "description": "IVPN Client", "author": "IVPN Limited", diff --git a/ui/src/config.js b/ui/src/config.js index defe3311..a015b700 100644 --- a/ui/src/config.js +++ b/ui/src/config.js @@ -33,7 +33,7 @@ function GetResourcesPath() { } export default { - MinRequiredDaemonVer: "3.5.0", + MinRequiredDaemonVer: "3.5.1", MinimizedUIWidth: 320, MaximizedUIWidth: 800,