diff options
| author | Felix Lange <fjl@twurst.com> | 2016-04-12 23:07:37 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-04-12 23:07:37 +0800 |
| commit | f460b0217fd8de6de90814e53e7ba4e2e86aff15 (patch) | |
| tree | 4aea9fd2f463a1656d9c07dc3c5c47b1f6001150 | |
| parent | 1e9b504ee7c7ebfd4b2658c66fad53fe6d440811 (diff) | |
| parent | a1f1c404c3a8c0d48b25602ef91581cb47677636 (diff) | |
| download | go-tangerine-f460b0217fd8de6de90814e53e7ba4e2e86aff15.tar go-tangerine-f460b0217fd8de6de90814e53e7ba4e2e86aff15.tar.gz go-tangerine-f460b0217fd8de6de90814e53e7ba4e2e86aff15.tar.bz2 go-tangerine-f460b0217fd8de6de90814e53e7ba4e2e86aff15.tar.lz go-tangerine-f460b0217fd8de6de90814e53e7ba4e2e86aff15.tar.xz go-tangerine-f460b0217fd8de6de90814e53e7ba4e2e86aff15.tar.zst go-tangerine-f460b0217fd8de6de90814e53e7ba4e2e86aff15.zip | |
Merge pull request #2446 from karalabe/console-unlock-fix
cmd/utils: fix accounts merge error on console unlock
| -rw-r--r-- | cmd/utils/jeth.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/utils/jeth.go b/cmd/utils/jeth.go index 708d457c6..cccf1bcf8 100644 --- a/cmd/utils/jeth.go +++ b/cmd/utils/jeth.go @@ -76,10 +76,9 @@ func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) { if call.Argument(1).IsUndefined() || call.Argument(1).IsNull() { fmt.Printf("Unlock account %s\n", account) if input, err := Stdin.PasswordPrompt("Passphrase: "); err != nil { - return otto.FalseValue() - passwd, _ = otto.ToValue(input) - } else { throwJSExeception(err.Error()) + } else { + passwd, _ = otto.ToValue(input) } } else { if !call.Argument(1).IsString() { |