From 085b858bb686204af6476b40af59e68f5e833a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Fri, 2 Feb 2018 11:56:07 +0100
Subject: [PATCH] Enable asm.slow by default, Remove some unneeded config

---
 src/cutter.cpp            | 28 +---------------------------
 src/utils/Configuration.h |  2 +-
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/src/cutter.cpp b/src/cutter.cpp
index e4062e0e..81d03859 100644
--- a/src/cutter.cpp
+++ b/src/cutter.cpp
@@ -774,12 +774,8 @@ void CutterCore::getOpcodes()
 void CutterCore::setSettings()
 {
     setConfig("scr.interactive", false);
-    // Intredazting...
-    //setConfig("asm.linesright", "true");
-    //setConfig("asm.lineswidth", "15");
-    //setConfig("asm.functions", "false");
+
     setConfig("hex.pairs", false);
-    setConfig("asm.cmtflgrefs", false);
     setConfig("asm.cmtcol", 70);
     setConfig("asm.xrefs", false);
     setConfig("asm.fcnlines", false);
@@ -787,40 +783,18 @@ void CutterCore::setSettings()
     setConfig("asm.tabsonce", true);
     setConfig("asm.tabsoff", 5);
     setConfig("asm.midflags", 2);
-    //setConfig("asm.bbline", "true");
-
-    // asm.offset=false would break reading the offset in DisassemblyWidget
-    // TODO: remove this when DisassemblyWidget::readDisassemblyOffset() allows it
-    setConfig("asm.offset", true);
 
     setConfig("anal.hasnext", true);
-    setConfig("asm.fcncalls", false);
-    setConfig("asm.calls", false);
     setConfig("asm.lines.call", false);
     setConfig("asm.flgoff", true);
     setConfig("anal.autoname", true);
 
-    // Highlight current node in graphviz
-    setConfig("graph.gv.current", true);
-
     // Fucking pancake xD
     setConfig("cfg.fortunes.tts", false);
 
-    // Experimenting with asm options
-    //setConfig("asm.spacy", "true");      // We need to handle blank lines on scroll
-    //setConfig("asm.section", "true");    // Breaks the disasm and navigation
-    //setConfig("asm.invhex", "true");     // Needs further testing
-    //setConfig("asm.flags", "false");     // Add with default true in future
-
     // Used by the HTML5 graph
     setConfig("http.cors", true);
     setConfig("http.sandbox", false);
-    //config("http.port", "14170");
-
-    // Temporary fixes
-    //setConfig("http.root","/usr/local/share/radare2/last/www");
-    //setConfig("http.root","/usr/local/radare2/osx/share/radare2/1.1.0-git/www");
-    //setConfig("bin.rawstr", "true");
 
     // Colors
     setConfig("scr.color", false);
diff --git a/src/utils/Configuration.h b/src/utils/Configuration.h
index 38e6dc16..07ca2576 100644
--- a/src/utils/Configuration.h
+++ b/src/utils/Configuration.h
@@ -58,7 +58,7 @@ public:
     bool getAsmStackPointer() const     { return s.value("asm.stackptr", false).toBool(); }
     void setAsmStackPointer(bool v)     { s.setValue("asm.stackptr", v); }
 
-    bool getAsmSlow() const             { return s.value("asm.slow", false).toBool(); }
+    bool getAsmSlow() const             { return s.value("asm.slow", true).toBool(); }
     void setAsmSlow(bool v)             { s.setValue("asm.slow", v); }
 
     bool getAsmLines() const            { return s.value("asm.lines", false).toBool(); }