From 9f5981ad059e18de554ce6c9cc8c6c2e6a0563a5 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 28 May 2015 11:29:28 +0200
Subject: [PATCH] Optimize Code set to false by default

---
 mix/CodeModel.h         |  2 +-
 mix/qml/Application.qml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mix/CodeModel.h b/mix/CodeModel.h
index 9e1fab3f3..b9d06341d 100644
--- a/mix/CodeModel.h
+++ b/mix/CodeModel.h
@@ -277,7 +277,7 @@ private:
 	std::map<QString, dev::bytes> m_compiledContracts; //by name
 	dev::Mutex x_pendingContracts;
 	std::map<QString, QString> m_pendingContracts; //name to source
-	bool m_optimizeCode = true;
+	bool m_optimizeCode = false;
 	friend class BackgroundWorker;
 };
 
diff --git a/mix/qml/Application.qml b/mix/qml/Application.qml
index bb0f215fe..d041f421e 100644
--- a/mix/qml/Application.qml
+++ b/mix/qml/Application.qml
@@ -420,19 +420,19 @@ ApplicationWindow {
 		text: qsTr("Display gas estimation")
 		shortcut: "Ctrl+G"
 		checkable: true
-		onTriggered:
-		{
-			mainContent.codeEditor.displayGasEstimation(checked);
-		}
+		onTriggered: mainContent.codeEditor.displayGasEstimation(checked);
 	}
 
 	Action {
 		id: optimizeCodeAction
-		text: qsTr("Optimize contract code")
+		text: qsTr("Enable optimized compilation")
 		shortcut: "Ctrl+Shift+O"
 		checkable: true
-		checked: true
-		Component.onCompleted: codeModel.setOptimizeCode(true);
 		onTriggered: codeModel.setOptimizeCode(checked);
 	}
+
+	Settings {
+		property alias gasEstimation: gasEstimationAction.checked
+		property alias optimizeCode: optimizeCodeAction.checked
+	}
 }