From 64733df11e7f806846a9216bf80da4f337ffd760 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Fri, 4 Jul 2014 15:09:41 +0200
Subject: [PATCH] Quick fix.

---
 CMakeLists.txt        |  5 ++---
 alethzero/MainWin.cpp | 14 ++++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be2eaedae..cbe2e447a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,9 +122,8 @@ if(${TARGET_PLATFORM} STREQUAL "w64")
 else()
 	# Look for available Crypto++ version and if it is >= 5.6.2
 	find_path(CRYPTOPP_ID cryptlib.h
-		../Xcryptopp/src
-		../../Xcryptopp/src)
-	message(${CRYPTOPP_ID})
+		../cryptopp/src
+		../../cryptopp/src)
 	if(NOT ${CRYPTOPP_ID} STREQUAL "CRYPTOPP_ID-NOTFOUND")
 		message("Local cryptopp OK.")
 		set(CRYPTOPP_LS ${CRYPTOPP_ID}/../target/build/release/libcryptopp.so)
diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index 249124c88..e3ac8246a 100644
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@@ -1216,15 +1216,17 @@ void Main::on_debug_clicked()
 			t.sign(s);
 			auto r = t.rlp();
 
-			m_currentExecution->setup(&r);
+			bool ok = m_currentExecution->setup(&r);
 			m_pcWarp.clear();
 			m_history.clear();
-			bool ok = true;
-			auto gasBegin = m_currentExecution->vm().gas();
-			while (ok)
+			if (ok)
 			{
-				m_history.append(WorldState({m_currentExecution->vm().curPC(), m_currentExecution->vm().gas(), gasBegin - m_currentExecution->vm().gas(), m_currentExecution->vm().stack(), m_currentExecution->vm().memory(), m_currentExecution->state().storage(m_currentExecution->ext().myAddress)}));
-				ok = !m_currentExecution->go(1);
+				auto gasBegin = m_currentExecution->vm().gas();
+				while (ok)
+				{
+					m_history.append(WorldState({m_currentExecution->vm().curPC(), m_currentExecution->vm().gas(), gasBegin - m_currentExecution->vm().gas(), m_currentExecution->vm().stack(), m_currentExecution->vm().memory(), m_currentExecution->state().storage(m_currentExecution->ext().myAddress)}));
+					ok = !m_currentExecution->go(1);
+				}
 			}
 			initDebugger();
 			m_currentExecution.reset();