From 6763d28a170b4e91c78532feed68805fe88c41dd Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 25 Jun 2014 18:18:22 +0100 Subject: [PATCH] repl.Stop() to only if running, fixes panic after js> exit followed by interrupt --- ethereum/repl.go | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/ethereum/repl.go b/ethereum/repl.go index c162c78b08..34380a06f4 100644 --- a/ethereum/repl.go +++ b/ethereum/repl.go @@ -23,6 +23,8 @@ type JSRepl struct { prompt string history *os.File + + running bool } func NewJSRepl(ethereum *eth.Ethereum) *JSRepl { @@ -35,26 +37,32 @@ func NewJSRepl(ethereum *eth.Ethereum) *JSRepl { } func (self *JSRepl) Start() { - logger.Infoln("init JS Console") - reader := bufio.NewReader(self.history) - for { - line, err := reader.ReadString('\n') - if err != nil && err == io.EOF { - break - } else if err != nil { - fmt.Println("error reading history", err) - break + if !self.running { + self.running = true + logger.Infoln("init JS Console") + reader := bufio.NewReader(self.history) + for { + line, err := reader.ReadString('\n') + if err != nil && err == io.EOF { + break + } else if err != nil { + fmt.Println("error reading history", err) + break + } + + addHistory(line[:len(line)-1]) } - - addHistory(line[:len(line)-1]) + self.read() } - self.read() } func (self *JSRepl) Stop() { - self.re.Stop() - logger.Infoln("exit JS Console") - self.history.Close() + if self.running { + self.running = false + self.re.Stop() + logger.Infoln("exit JS Console") + self.history.Close() + } } func (self *JSRepl) parseInput(code string) {