6 files changed, 18 insertions, 1 deletions
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateLibraryClass.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateLibraryClass.java
index 8abca63..8e796d4 100644
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateLibraryClass.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateLibraryClass.java
@@ -155,6 +155,9 @@ public class UpdateLibraryClass extends JFrame implements ActionListener {
     Remove original library classes before saving updated ones
     **/
     protected void save() {
+        if (jTable.isEditing()) {
+            jTable.getCellEditor().stopCellEditing();
+        }
         sfc.removeSpdLibClass();
         int rowCount = model.getRowCount();
         int i = 0;
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateMsaFile.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateMsaFile.java
index d06b24f..c6fc235 100644
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateMsaFile.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateMsaFile.java
@@ -152,7 +152,9 @@ public class UpdateMsaFile extends JFrame implements ActionListener {
     Remove original Msa files before saving updated ones
     **/
     protected void save() {
-
+        if (jTable.isEditing()) {
+            jTable.getCellEditor().stopCellEditing();
+        }
         sfc.removeSpdMsaFile();
         int rowCount = jTable.getRowCount();
         int i = 0;
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePCD.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePCD.java
index 61b48d4..44d8970 100644
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePCD.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePCD.java
@@ -115,6 +115,9 @@ public class UpdatePCD extends JFrame implements ActionListener {
     Remove original Pcd definitions before saving updated ones
     **/
     protected void save() {
+        if (jTable.isEditing()) {
+            jTable.getCellEditor().stopCellEditing();
+        }
         sfc.removeSpdPcdDefinition();
         int rowCount = model.getRowCount();
         int i = 0;
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePkgHeader.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePkgHeader.java
index cccc323..77c8ff5 100644
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePkgHeader.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePkgHeader.java
@@ -174,6 +174,9 @@ public class UpdatePkgHeader extends JFrame implements ActionListener {
     Remove original package headers before saving updated ones
     **/
     protected void save() {
+        if (jTable.isEditing()) {
+            jTable.getCellEditor().stopCellEditing();
+        }
         sfc.removeSpdPkgHeader();
         int rowCount = model.getRowCount();
         int i = 0;
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePpi.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePpi.java
index da1dc68..17fb13f 100644
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePpi.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePpi.java
@@ -156,6 +156,9 @@ public class UpdatePpi extends JFrame implements ActionListener {
     Remove original ppi declarations before saving updated ones
     **/
     protected void save() {
+        if (jTable.isEditing()) {
+            jTable.getCellEditor().stopCellEditing();
+        }
         sfc.removeSpdPpiDeclaration();
         int rowCount = model.getRowCount();
         int i = 0;
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateProtocols.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateProtocols.java
index 614cf82..5521867 100644
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateProtocols.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateProtocols.java
@@ -156,6 +156,9 @@ public class UpdateProtocols extends JFrame implements ActionListener {
     Remove original protocol declarations before saving updated ones
     **/
     protected void save() {
+        if (jTable.isEditing()) {
+            jTable.getCellEditor().stopCellEditing();
+        }
         sfc.removeSpdProtocolDeclaration();
         int rowCount = model.getRowCount();
         int i = 0;