From b095bd32371f02d204a4d0fbde75dc58baa7430d Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 27 Oct 2014 11:50:38 +0100
Subject: [PATCH] events should be set prior to calling mainloop
---
cmd/mist/flags.go | 2 +-
javascript/javascript_runtime.go | 8 ++++----
utils/cmd.go | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go
index 5283c332b..3aa2e21c8 100644
--- a/cmd/mist/flags.go
+++ b/cmd/mist/flags.go
@@ -67,7 +67,7 @@ func defaultAssetPath() string {
// assume a debug build and use the source directory as
// asset directory.
pwd, _ := os.Getwd()
- if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "mist") {
+ if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist") {
assetPath = path.Join(pwd, "assets")
} else {
switch runtime.GOOS {
diff --git a/javascript/javascript_runtime.go b/javascript/javascript_runtime.go
index b0d7c81b5..704635d97 100644
--- a/javascript/javascript_runtime.go
+++ b/javascript/javascript_runtime.go
@@ -41,7 +41,7 @@ func (jsre *JSRE) LoadExtFile(path string) {
}
func (jsre *JSRE) LoadIntFile(file string) {
- assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "mist", "assets", "ext")
+ assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist", "assets", "ext")
jsre.LoadExtFile(path.Join(assetPath, file))
}
@@ -62,13 +62,13 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE {
re.LoadIntFile("string.js")
re.LoadIntFile("big.js")
- // We have to make sure that, whoever calls this, calls "Stop"
- go re.mainLoop()
-
// Subscribe to events
mux := ethereum.EventMux()
re.events = mux.Subscribe(ethchain.NewBlockEvent{})
+ // We have to make sure that, whoever calls this, calls "Stop"
+ go re.mainLoop()
+
re.Bind("eth", &JSEthereum{re.pipe, re.Vm, ethereum})
re.initStdFuncs()
diff --git a/utils/cmd.go b/utils/cmd.go
index 76faa5dac..c46e1f00d 100644
--- a/utils/cmd.go
+++ b/utils/cmd.go
@@ -192,7 +192,7 @@ func DefaultAssetPath() string {
// assume a debug build and use the source directory as
// asset directory.
pwd, _ := os.Getwd()
- if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "mist") {
+ if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist") {
assetPath = path.Join(pwd, "assets")
} else {
switch runtime.GOOS {
--
GitLab