Fix T66675: Auto-Save override button has no tooltip

1 files changed, 11 insertions, 6 deletions

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 4fc54de7c4d..2f573d83132 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -40,17 +40,22 @@ class USERPREF_HT_header(Header):
 
         row = layout.row()
         row.menu("USERPREF_MT_save_load", text="", icon='COLLAPSEMENU')
+        # Use '_is_startup' so once factory settings are loaded
+        # this display option will show, since it's confusing if disabling
+        # the option makes it dissapiers.
         if prefs.use_preferences_save:
-            if bpy.app.use_userpref_skip_save_on_exit:
-                # We should have an 'alert' icon, for now use 'error'.
+            use_userpref_skip_save_on_exit = bpy.app.use_userpref_skip_save_on_exit
+            if use_userpref_skip_save_on_exit or getattr(USERPREF_HT_header, "_is_startup", False):
+                USERPREF_HT_header._is_startup = True
+
                 sub = row.row(align=True)
+                sub.alignment = 'LEFT'
                 props = sub.operator(
-                    "wm.context_toggle",
+                    "preferences.autosave_override_toggle",
                     text="Skip Auto-Save",
-                    icon='CHECKBOX_HLT',
+                    emboss=False,
+                    icon='CHECKBOX_HLT' if use_userpref_skip_save_on_exit else 'CHECKBOX_DEHLT',
                 )
-                props.module = "bpy.app"
-                props.data_path = "use_userpref_skip_save_on_exit"
         else:
             sub = row.row(align=True)
             sub.active = prefs.is_dirty