From b31f43aad49341184ff1127c2ee10aca48b92c6c Mon Sep 17 00:00:00 2001 From: cyberarm Date: Tue, 6 Oct 2020 19:44:35 -0500 Subject: [PATCH] Fix #2 edit dialog prevents update from working unless item name is changed. --- .../TimeCraftersConfigurationTool/dialogs/ActionDialog.java | 2 +- .../TimeCraftersConfigurationTool/dialogs/GroupDialog.java | 2 +- .../TimeCraftersConfigurationTool/dialogs/VariableDialog.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ActionDialog.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ActionDialog.java index 59d2f0a..23529ee 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ActionDialog.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ActionDialog.java @@ -127,7 +127,7 @@ public class ActionDialog extends TimeCraftersDialog { } } - if (!nameUnique) { + if (!nameUnique && action == null) { message += "Name is not unique!"; } else if (name.length() <= 0) { diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/GroupDialog.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/GroupDialog.java index 04db9b5..c39da31 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/GroupDialog.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/GroupDialog.java @@ -119,7 +119,7 @@ public class GroupDialog extends TimeCraftersDialog { } } - if (!nameUnique) { + if (!nameUnique && group == null) { message += "Name is not unique!"; } else if (name.length() <= 0) { diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java index 8aebfa8..63e21d2 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java @@ -201,7 +201,7 @@ public class VariableDialog extends TimeCraftersDialog { } } - if (!nameUnique) { + if (!nameUnique && variable == null) { nameMessage += "Name is not unique!"; } else if (name.length() <= 0) {