aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-14 00:57:46 +0800
committerobscuren <geffobscura@gmail.com>2015-02-14 00:57:46 +0800
commit790de35e7ff5235c83e081faf00aff35640cdcc6 (patch)
tree7aa43907d20ab4f2ed0c1553bb19818f864b1a52
parent218f437b0c2a80aa189e703520b5e1a5b9841b0f (diff)
downloadgo-tangerine-790de35e7ff5235c83e081faf00aff35640cdcc6.tar.gz
go-tangerine-790de35e7ff5235c83e081faf00aff35640cdcc6.tar.zst
go-tangerine-790de35e7ff5235c83e081faf00aff35640cdcc6.zip
Fixed issue in peer window
* Fixed issues where new peer window could cause a crash when entering an empty string
-rw-r--r--cmd/ethereum/main.go2
-rw-r--r--cmd/mist/assets/qml/main.qml20
-rw-r--r--cmd/mist/main.go2
3 files changed, 14 insertions, 10 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index d2b3418cd..0dba462be 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -37,7 +37,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.8.2"
+ Version = "0.8.3"
)
var clilogger = logger.NewLogger("CLI")
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index 1d6b15ac1..ecc121407 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -61,11 +61,11 @@ ApplicationWindow {
function activeView(view, menuItem) {
mainSplit.setView(view, menuItem)
if (view.hideUrl) {
- urlPane.visible = false;
- mainView.anchors.top = rootView.top
+ //urlPane.visible = false;
+ //mainView.anchors.top = rootView.top
} else {
- urlPane.visible = true;
- mainView.anchors.top = divider.bottom
+ //urlPane.visible = true;
+ //mainView.anchors.top = divider.bottom
}
}
@@ -1069,8 +1069,10 @@ ApplicationWindow {
anchors.rightMargin: 10
placeholderText: "enode://<hex node id>:<IP address>:<port>"
onAccepted: {
- eth.connectToPeer(addrField.text)
- addPeerWin.visible = false
+ if(addrField.text.length != 0) {
+ eth.connectToPeer(addrField.text)
+ addPeerWin.visible = false
+ }
}
}
@@ -1081,8 +1083,10 @@ ApplicationWindow {
anchors.rightMargin: 10
text: "Connect"
onClicked: {
- eth.connectToPeer(addrField.currentText)
- addPeerWin.visible = false
+ if(addrField.text.length != 0) {
+ eth.connectToPeer(addrField.text)
+ addPeerWin.visible = false
+ }
}
}
Component.onCompleted: {
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 52b5e4e94..32222fbef 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -36,7 +36,7 @@ import (
const (
ClientIdentifier = "Mist"
- Version = "0.8.2"
+ Version = "0.8.3"
)
var ethereum *eth.Ethereum