From 6be0a2931fdf906ea4159cc1f147248a66320269 Mon Sep 17 00:00:00 2001
From: alfrix <alfredomonclus@gmail.com>
Date: Wed, 30 Aug 2023 00:19:23 -0300
Subject: [PATCH] spoolman: change initialization to be equal to the rest of
 components

---
 ks_includes/printer.py |  1 -
 screen.py              | 15 ++-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/ks_includes/printer.py b/ks_includes/printer.py
index b74de2ee..605f40af 100644
--- a/ks_includes/printer.py
+++ b/ks_includes/printer.py
@@ -38,7 +38,6 @@ class Printer:
         self.fancount = 0
         self.output_pin_count = 0
         self.tempstore = {}
-        self.spoolman = False
         self.busy = False
         if not self.store_timeout:
             self.store_timeout = GLib.timeout_add_seconds(1, self._update_temp_store)
diff --git a/screen.py b/screen.py
index 2c775679..a660e9b2 100755
--- a/screen.py
+++ b/screen.py
@@ -867,6 +867,8 @@ class KlipperScreen(Gtk.Window):
             cameras = self.apiclient.send_request("server/webcams/list")
             if cameras is not False:
                 self.printer.configure_cameras(cameras['result']['webcams'])
+        if "spoolman" in server_info["components"]:
+            self.printer.enable_spoolman()
 
         if state['result']['klippy_connected'] is False:
             logging.info("Klipper not connected")
@@ -903,8 +905,6 @@ class KlipperScreen(Gtk.Window):
         self.files.initialize()
         self.files.refresh_files()
 
-        self.init_spoolman()
-
         logging.info("Printer initialized")
         self.initialized = True
         self.reinit_count = 0
@@ -932,17 +932,6 @@ class KlipperScreen(Gtk.Window):
                 logging.error("Couldn't get the temperature store size")
         return False
 
-    def init_spoolman(self):
-        server_config = self.apiclient.send_request("server/config")
-        if server_config:
-            try:
-                server_config["result"]["config"]["spoolman"]
-                self.printer.enable_spoolman()
-            except KeyError:
-                logging.warning("Not using Spoolman")
-
-        return False
-
     def show_keyboard(self, entry=None, event=None):
         if self.keyboard is not None:
             return