Merge origin/master

This commit is contained in:
Jindra Petřík
2016-01-04 22:00:14 +01:00
4 changed files with 18 additions and 3 deletions

View File

@@ -1047,7 +1047,12 @@ public abstract class MainFrameMenu implements MenuBuilder {
private void viewHexActionPerformed(ActionEvent evt) {
Configuration.dumpView.set(true);
mainFrame.getPanel().showView(MainPanel.VIEW_DUMP);
MainPanel mainPanel = mainFrame.getPanel();
if (mainPanel.isModified()) {
View.showMessageDialog(null, translate("message.warning.hexViewNotUpToDate"), translate("message.warning"), JOptionPane.WARNING_MESSAGE, Configuration.warningHexViewNotUpToDate);
}
mainPanel.showView(MainPanel.VIEW_DUMP);
setGroupSelection("view", "/file/view/viewHex");
setMenuChecked("/tools/timeline", false);
}