Fix choiceSet default timeoutbugfix/issue_1630_fix_choice_set_default_timeout

1 files changed, 3 insertions, 3 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java
index 58b1e41f6..37c6300bf 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java
@@ -303,7 +303,7 @@ public class ChoiceSet {
      */
     public Integer getTimeout() {
         if (timeout == null) {
-            timeout = defaultTimeout;
+            timeout = getDefaultTimeout();
         } else if (timeout < TIMEOUT_MIN) {
             return TIMEOUT_MIN;
         } else if (timeout > TIMEOUT_MAX) {
@@ -323,9 +323,9 @@ public class ChoiceSet {
 
     public int getDefaultTimeout() {
         if (defaultTimeout < TIMEOUT_MIN) {
-            this.defaultTimeout = TIMEOUT_MIN;
+            return TIMEOUT_MIN;
         } else if (defaultTimeout > TIMEOUT_MAX) {
-            this.defaultTimeout = TIMEOUT_MAX;
+            return TIMEOUT_MAX;
         }
         return defaultTimeout;
     }