From d9cd1d43254a3d625f44c7e373d7de71eb2a79db Mon Sep 17 00:00:00 2001 From: arkpar Date: Fri, 23 Jan 2015 13:14:59 +0100 Subject: [PATCH] minor fixes --- mix/CodeModel.cpp | 2 ++ mix/qml/StatusPane.qml | 2 +- mix/qml/WebPreview.qml | 5 +---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mix/CodeModel.cpp b/mix/CodeModel.cpp index 9a33e18ee..0ea754eb4 100644 --- a/mix/CodeModel.cpp +++ b/mix/CodeModel.cpp @@ -62,6 +62,8 @@ CompilationResult::CompilationResult(const dev::solidity::CompilerStack& _compil m_assemblyCode = QString::fromStdString(dev::eth::disassemble(m_bytes)); dev::solidity::InterfaceHandler interfaceHandler; m_contractInterface = QString::fromStdString(*interfaceHandler.getABIInterface(contractDefinition)); + if (m_contractInterface.isEmpty()) + m_contractInterface = "[]"; } else m_contract.reset(new QContractDefinition()); diff --git a/mix/qml/StatusPane.qml b/mix/qml/StatusPane.qml index c6c531a80..f9bccef39 100644 --- a/mix/qml/StatusPane.qml +++ b/mix/qml/StatusPane.qml @@ -114,7 +114,7 @@ Rectangle { id: debugRunActionIcon onTriggered: { mainContent.toggleRightView(); - if (mainContent.rightViewVisible()) + if (mainContent.rightViewVisible) clientModel.debugDeployment(); } enabled: false diff --git a/mix/qml/WebPreview.qml b/mix/qml/WebPreview.qml index 1cf64eae6..dd9e24bfe 100644 --- a/mix/qml/WebPreview.qml +++ b/mix/qml/WebPreview.qml @@ -27,10 +27,7 @@ Item { } function updateContract() { - var contractInterface = codeModel.code.contractInterface; - if (contractInterface === "") - contractInterface = "[]" - webView.runJavaScript("updateContract(\"" + clientModel.contractAddress + "\", " + contractInterface + ")"); + webView.runJavaScript("updateContract(\"" + clientModel.contractAddress + "\", " + codeModel.code.contractInterface + ")"); } function reloadOnSave() {