layouts: be sure spaceline is loaded before restoring layouts

fixes #10849

layers/+spacemacs/spacemacs-layouts/funcs.el

@@ -12,6 +12,20 @@
 
 ;; General Persp functions
 
+(defun spacemacs//activate-persp-mode ()
+  "Always activate persp-mode, unless it is already active.
+ (e.g. don't re-activate during `dotspacemacs/sync-configuration-layers' -
+ see issues #5925 and #3875)"
+  (unless (bound-and-true-p persp-mode)
+    (persp-mode)))
+
+(defun spacemacs//layout-wait-for-modeline ()
+  "Assure the mode-line is loaded before restoring the layouts."
+  (advice-remove 'persp-load-state-from-file 'spacemacs//layout-wait-for-modeline)
+  (when (and (configuration-layer/package-used-p 'spaceline)
+             (memq (spacemacs/get-mode-line-theme-name) '(spacemacs all-the-icons custom)))
+    (require 'spaceline-config)))
+
 (defun spacemacs//current-layout-name ()
   "Get name of the current perspective."
   (safe-persp-name (get-frame-persp)))

layers/+spacemacs/spacemacs-layouts/packages.el

@@ -129,12 +129,6 @@
             persp-save-dir spacemacs-layouts-directory
             persp-set-ido-hooks t)
 
-      (defun spacemacs//activate-persp-mode ()
-        "Always activate persp-mode, unless it is already active.
- (e.g. don't re-activate during `dotspacemacs/sync-configuration-layers' -
- see issues #5925 and #3875)"
-        (unless (bound-and-true-p persp-mode)
-          (persp-mode)))
       (spacemacs/defer-until-after-user-config #'spacemacs//activate-persp-mode)
 
       ;; layouts transient state
@@ -224,6 +218,7 @@
       (defadvice persp-activate (before spacemacs//save-toggle-layout activate)
         (setq spacemacs--last-selected-layout persp-last-persp-name))
       (add-hook 'persp-mode-hook 'spacemacs//layout-autosave)
+      (advice-add 'persp-load-state-from-file :before 'spacemacs//layout-wait-for-modeline)
       (spacemacs/declare-prefix "b" "persp-buffers")
       ;; Override SPC TAB to only change buffers in perspective
       (spacemacs/set-leader-keys

layers/+spacemacs/spacemacs-modeline/packages.el

@@ -75,7 +75,9 @@
              (t 'wave))
             powerline-image-apple-rgb (eq window-system 'ns)
             powerline-scale (or (spacemacs/mode-line-separator-scale) 1.5)
-            powerline-height (spacemacs/compute-mode-line-height))
+            powerline-height (spacemacs/compute-mode-line-height)))
+    :config
+    (progn
       (spacemacs|do-after-display-system-init
        ;; seems to be needed to avoid weird graphical artefacts with the
        ;; first graphical client
@@ -86,9 +88,7 @@
        ;; is computed here
        (setq powerline-height (spacemacs/compute-mode-line-height))
        (require 'spaceline)
-       (spaceline-compile)))
-    :config
-    (progn
+       (spaceline-compile))
       (spacemacs/customize-powerline-faces)
       (setq spaceline-org-clock-p nil
             spaceline-highlight-face-func 'spacemacs//evil-state-face)