Fix SoftButton delayfeature/issue_1600_softbutton_delay

2 files changed, 3 insertions, 3 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java
index e2611a959..3aa770ec0 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java
@@ -229,7 +229,7 @@ class SoftButtonReplaceOperation extends Task {
                 }
             }
         });
-        show.setMainField1(currentMainField1);
+        show.setMainField1((currentMainField1 == null ? "" : currentMainField1));
         show.setSoftButtons(softButtons);
         if (internalInterface.get() != null) {
             internalInterface.get().sendRPC(show);
@@ -277,7 +277,7 @@ class SoftButtonReplaceOperation extends Task {
                 }
             }
         });
-        show.setMainField1(currentMainField1);
+        show.setMainField1((currentMainField1 == null ? "" : currentMainField1));
         show.setSoftButtons(textButtons);
         if (internalInterface.get() != null) {
             internalInterface.get().sendRPC(show);
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonTransitionOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonTransitionOperation.java
index 458677269..106dce5e5 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonTransitionOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonTransitionOperation.java
@@ -53,7 +53,7 @@ class SoftButtonTransitionOperation extends Task {
                 onFinished();
             }
         });
-        show.setMainField1(currentMainField1);
+        show.setMainField1(currentMainField1 == null ? "" : currentMainField1);
         show.setSoftButtons(currentStateSoftButtonsForObjects(softButtonObjects));
         if (internalInterface.get() != null) {
             internalInterface.get().sendRPC(show);