diff options
Diffstat (limited to 'qtmips_gui')
| -rw-r--r-- | qtmips_gui/MainWindow.ui | 2 | ||||
| -rw-r--r-- | qtmips_gui/programmodel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qtmips_gui/MainWindow.ui b/qtmips_gui/MainWindow.ui index 4847304..338f9d1 100644 --- a/qtmips_gui/MainWindow.ui +++ b/qtmips_gui/MainWindow.ui @@ -301,7 +301,7 @@ <string>Cop0 State</string> </property> <property name="shortcut"> - <string>Ctrl+C</string> + <string>Ctrl+I</string> </property> </action> <action name="actionReload"> diff --git a/qtmips_gui/programmodel.cpp b/qtmips_gui/programmodel.cpp index 5112bb8..76473a8 100644 --- a/qtmips_gui/programmodel.cpp +++ b/qtmips_gui/programmodel.cpp @@ -233,7 +233,7 @@ bool ProgramModel::setData(const QModelIndex & index, const QVariant & value, in mem->write_word(address, data); break; case 3: - data = machine::Instruction::from_string(value.toString(), &ok).data(); + data = machine::Instruction::from_string(value.toString(), &ok, address).data(); if (!ok) return false; mem->write_word(address, data); |