From 7f378d66c3bf5bdabb602868a2bbadb28baed86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Tue, 28 Nov 2017 14:24:35 +0100 Subject: [PATCH] Force asm.offset=true for now --- src/cutter.cpp | 4 ++++ src/dialogs/AsmOptionsDialog.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/cutter.cpp b/src/cutter.cpp index c55ed3c0..f3d508a1 100644 --- a/src/cutter.cpp +++ b/src/cutter.cpp @@ -829,6 +829,10 @@ void CutterCore::setSettings() 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); diff --git a/src/dialogs/AsmOptionsDialog.cpp b/src/dialogs/AsmOptionsDialog.cpp index 84f91d27..2ac8b011 100644 --- a/src/dialogs/AsmOptionsDialog.cpp +++ b/src/dialogs/AsmOptionsDialog.cpp @@ -24,6 +24,10 @@ AsmOptionsDialog::AsmOptionsDialog(QWidget *parent) QFont currentFont = Config()->getFont(); ui->fontSelectionLabel->setText(currentFont.toString()); + // asm.offset=false would break reading the offset in DisassemblyWidget + // TODO: remove this when DisassemblyWidget::readDisassemblyOffset() allows it + ui->offsetCheckBox->setVisible(false); + updateFromVars(); }