Merge pull request #2049 from livecode/merge-develop-9.0-28.03.2019

Merge develop 9.0 28.03.2019

Author: livecodeali

Toolset/home.livecodescript

@@ -907,7 +907,7 @@ local sSavePreferencesMessage
 
 command revInternal__SavePreferences
    cancel sSavePreferencesMessage
-   send "__revInternal_SavePreferences" to me in 500 milliseconds
+   send "__revInternal_SavePreferences" to me in 30 seconds
    put the result into sSavePreferencesMessage
 end revInternal__SavePreferences
 

Toolset/libraries/revidelibrary.8.livecodescript

@@ -2280,9 +2280,11 @@ Example: set revIDEGetPreference("text size") to 12
 Returns (Any): The value of the preference
 */
 on revIDESetPreference pPreferenceName, pValue
-   set the pPreferenceName of stack "revpreferences" to pValue
-   revInternal__SavePreferences
-   ideMessageSend "idePreferenceChanged:" & pPreferenceName,pValue
+   if the pPreferenceName of stack "revpreferences" is not pValue then
+      set the pPreferenceName of stack "revpreferences" to pValue
+      revInternal__SavePreferences
+      ideMessageSend "idePreferenceChanged:" & pPreferenceName,pValue
+   end if
 end revIDESetPreference
 
 command revIDESetPreferenceOfSet pSetName, pPreferenceName, pValue
@@ -5109,6 +5111,27 @@ private on __setPropertyOfObject pObject, pProperty, pValue
 
 end __setPropertyOfObject
 
+function ideCheckStackName pName
+   if char 1 to 3 of pName is "rev" then
+      answer warning revIDELocalise("Using rev in the first three characters of a stack name is reserved for use by the LiveCode development environment and advanced users creating Plug-ins. If you use these characters, your stack may not behave as expected.") with revIDELocalise("OK") and revIDELocalise("Cancel")
+      if it is revIDELocalise("Cancel") then
+         return false
+      end if
+   end if
+   if pName is a number then
+      beep
+      answer error revIDELocalise("You cannot set the name of a stack to a number.")
+      return false
+   end if
+   if pName contains quote then 
+      beep
+      answer error revIDELocalise("The name of the stack cannot contain quotes")
+      return false
+   end if 
+   
+   return true
+end ideCheckStackName
+
 on revIDEPropertySet pObjectList, pProperty, pValue, pLockUpdates
    local tThrottlePropertyChanged
    put false into tThrottlePropertyChanged
@@ -5130,27 +5153,14 @@ on revIDEPropertySet pObjectList, pProperty, pValue, pLockUpdates
 
          # If stack name is changed, use new name when setting edited
          if tStack is tObject and pProperty is "name" then
-            local tOldName
-            put the short name of tStack into tOldName
-            if char 1 to 3 of pValue is "rev" then
-               answer warning revIDELocalise("Using rev in the first three characters of a stack name is reserved for use by the LiveCode development environment and advanced users creating Plug-ins. If you use these characters, your stack may not behave as expected.") with revIDELocalise("OK") and revIDELocalise("Cancel")
-               if it is revIDELocalise("Cancel") then
-                  set the name of tStack to tOldName
-                  exit revIDEPropertySet
-               end if
-            end if
-            if pValue is a number then 
-               beep
-               answer error revIDELocalise("You cannot set the name of a stack to a number.")
-               set the name of tStack to tOldName
-               exit revIDEPropertySet
-            end if
-            if pValue contains quote then 
-               beep
-               answer error revIDELocalise("The name of the stack cannot contain quotes")
+            
+            if not ideCheckStackName(pValue) then
+               local tOldName
+               put the short name of tStack into tOldName
                set the name of tStack to tOldName
                exit revIDEPropertySet
             end if
+            
             put pValue into tStackName
          else
             put the short name of tStack into tStackName