colin/browserpass-native
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix order of respecting settings

Browse Source
This commit is contained in:
Maxim Baz
2019-03-16 14:53:24 +01:00
parent cbbf6b73ff
commit 45d63b9d88
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
request/fetch.go
View File

@@ -65,11 +65,11 @@ func fetchDecryptedContents(request *request) {
store.Path = normalizedStorePath store.Path = normalizedStorePath
var gpgPath string var gpgPath string
if store.Settings.GpgPath != "" || request.Settings.GpgPath != "" { if request.Settings.GpgPath != "" || store.Settings.GpgPath != "" {
if store.Settings.GpgPath != "" { if request.Settings.GpgPath != "" {
gpgPath = store.Settings.GpgPath
} else {
gpgPath = request.Settings.GpgPath gpgPath = request.Settings.GpgPath
} else {
gpgPath = store.Settings.GpgPath
} }
err = validateGpgBinary(gpgPath) err = validateGpgBinary(gpgPath)
if err != nil { if err != nil {