From b0a4eaa65a0ddbe989ab095afd7e83862a0d9c23 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sun, 11 Oct 2020 07:46:50 +0200
Subject: [PATCH] Ensure a couple of initialisations are never skipped

Otherwise we may get segv in window mode.
---
 src/session.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/session.c b/src/session.c
index fcf94402..6f1a2ec5 100644
--- a/src/session.c
+++ b/src/session.c
@@ -404,19 +404,19 @@ ice_init(void)
 void
 SessionInit(void)
 {
-   if (Mode.wm.window)
-      return;
-
-#if USE_SM
-   ice_init();
-#endif
-
    if (!Conf.session.script)
       Conf.session.script = Estrdup("$EROOT/scripts/session.sh");
    if (!Conf.session.cmd_reboot)
       Conf.session.cmd_reboot = Estrdup("reboot");
    if (!Conf.session.cmd_halt)
       Conf.session.cmd_halt = Estrdup("poweroff");
+
+   if (Mode.wm.window)
+      return;
+
+#if USE_SM
+   ice_init();
+#endif
 }
 
 #if USE_SM