Merge pull request #12690 from uckelman/delayed_notes_col_fix

12324 - Fixed ClassCastException caused by reordering columns in Delayed Notes table
vassalengine · Sep 13, 2023 · 469a785 · 469a785
2 parents b28514e + b06e8d2
commit 469a785
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/vassal-app/src/main/java/VASSAL/build/module/noteswindow/SecretNotesController.java b/vassal-app/src/main/java/VASSAL/build/module/noteswindow/SecretNotesController.java
@@ -427,9 +427,8 @@ private void revealSelectedNote() {
       if (selectedRow < 0) {
         return;
       }
-      final String selectedName = (String) table.getValueAt(selectedRow, COL_NAME);
-      SecretNote note = getNoteForName(selectedName);
 
+      SecretNote note = notes.get(table.convertRowIndexToModel(selectedRow));
       if (note.getOwner().equals(GameModule.getActiveUserId())) {
         note = new SecretNote(note.getName(), note.getOwner(), note.getText(), false, note.getDate(), note.getHandle());
         if (note != null) {
@@ -521,9 +520,8 @@ private void displaySelected() {
       if (selectedRow < 0) {
         return;
       }
-      final String selectedName = (String) table.getValueAt(selectedRow, COL_NAME);
-      final SecretNote note = getNoteForName(selectedName);
 
+      final SecretNote note = notes.get(table.convertRowIndexToModel(selectedRow));
       if (note != null) {
         if (note.getOwner().equals(GameModule.getActiveUserId())) {
           text.setText(note.getText());