From c17edbff0a7c5e01b1b4a2a9d51112a9a6127a66 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 26 Mar 2015 16:41:23 +0100
Subject: [PATCH] - bug fix #1386

---
 mix/ClientModel.cpp    | 15 ++++++++++++---
 mix/qml/StatusPane.qml |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/mix/ClientModel.cpp b/mix/ClientModel.cpp
index a49ee3661..6ba7e54f9 100644
--- a/mix/ClientModel.cpp
+++ b/mix/ClientModel.cpp
@@ -242,7 +242,12 @@ void ClientModel::executeSequence(std::vector<TransactionSettings> const& _seque
 								break;
 							}
 					if (!f)
-						BOOST_THROW_EXCEPTION(FunctionNotFoundException() << FunctionName(transaction.functionId.toStdString()));
+					{
+						emit runFailed("Function '" + transaction.functionId + tr("' not found. Please check transactions or the contract code."));
+						m_running = false;
+						emit runStateChanged();
+						return;
+					}
 					if (!transaction.functionId.isEmpty())
 						encoder.encode(f);
 					for (QVariableDeclaration const* p: f->parametersList())
@@ -269,7 +274,12 @@ void ClientModel::executeSequence(std::vector<TransactionSettings> const& _seque
 					{
 						auto contractAddressIter = m_contractAddresses.find(transaction.contractId);
 						if (contractAddressIter == m_contractAddresses.end())
-							BOOST_THROW_EXCEPTION(dev::Exception() << dev::errinfo_comment("Contract not deployed: " + transaction.contractId.toStdString()));
+						{
+							emit runFailed("Contract '" + transaction.contractId + tr(" not deployed.") + "' " + tr(" Cannot call ") + transaction.functionId);
+							m_running = false;
+							emit runStateChanged();
+							return;
+						}
 						callContract(contractAddressIter->second, encoder.encodedData(), transaction);
 					}
 				}
@@ -283,7 +293,6 @@ void ClientModel::executeSequence(std::vector<TransactionSettings> const& _seque
 			std::cerr << boost::current_exception_diagnostic_information();
 			emit runFailed(QString::fromStdString(boost::current_exception_diagnostic_information()));
 		}
-
 		catch(std::exception const& e)
 		{
 			std::cerr << boost::current_exception_diagnostic_information();
diff --git a/mix/qml/StatusPane.qml b/mix/qml/StatusPane.qml
index 1e440b3a8..70a4b1d30 100644
--- a/mix/qml/StatusPane.qml
+++ b/mix/qml/StatusPane.qml
@@ -76,9 +76,9 @@ Rectangle {
 		function format(_message)
 		{
 			var formatted = _message.match(/(?:<dev::eth::)(.+)(?:>)/);
-			if (formatted === null)
+			if (formatted)
 				formatted = _message.match(/(?:<dev::)(.+)(?:>)/);
-			if (formatted.length > 1)
+			if (formatted && formatted.length > 1)
 				formatted = formatted[1];
 			else
 				return _message;