From 43e8eff0035543ce0cb4708eb473545fc2dd6eeb Mon Sep 17 00:00:00 2001
From: packerlschupfer <83344883+packerlschupfer@users.noreply.github.com>
Date: Tue, 8 Sep 2026 08:13:38 +0200
Subject: [PATCH] Moonraker: treat print_queued as Moonraker owning the print
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reading only result.print_started missed the exact case this PR set out to
fix. Moonraker's upload response carries two flags:

    print_started : it began the print immediately
    print_queued  : it accepted the job but has not started it yet

The power-on path (`[power] on_when_upload_queued`) is the second one:
Moonraker queues the job, powers the printer up and waits for Klippy to
report READY, so it answers print_started=false, print_queued=true.

With only print_started read, moonraker_started_print stayed false, the
fallback fired, and our explicit /printer/print/start hit the same not-ready
Klippy that produced the original 503 — i.e. the fix did not fix #14945 for
the configuration that reported it.

Verified the response schema against Moonraker v0.11.0 (API 1.5.0); an
upload with print=true on a ready printer returns:

    {"action": "create_file", "item": {...},
     "print_started": true, "print_queued": false}

Both fields are present, so reading print_queued is safe on this version and
the `false` default keeps older hosts on the existing fallback path.

Caught by @raistlin7447 in review of #15032; the fix is their suggestion.
---
 src/slic3r/Utils/Moonraker.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/Utils/Moonraker.cpp b/src/slic3r/Utils/Moonraker.cpp
index a62e55206a..fd7ed7eae1 100644
--- a/src/slic3r/Utils/Moonraker.cpp
+++ b/src/slic3r/Utils/Moonraker.cpp
@@ -214,8 +214,12 @@ bool Moonraker::upload(PrintHostUpload upload_data, ProgressFn progress_fn, Erro
 {
     // POST /server/files/upload with `print=true` so Moonraker queues the print
     // itself and respects [power] on_when_upload_queued (issue #14945). Older
-    // Moonrakers that ignore the flag return print_started=false and we fall
-    // back to the explicit /printer/print/start below.
+    // Moonraker reports back in two fields: print_started when it began the print
+    // immediately, print_queued when it accepted the job but has not started it yet
+    // -- which is exactly the power-on case, where it waits for Klippy to become
+    // READY. Either means Moonraker owns the print and we must NOT issue our own
+    // /printer/print/start. Only when both are false (an older Moonraker or a fork
+    // that ignores the flag) do we fall back to the explicit start below.
     wxString test_msg;
     if (!test(test_msg)) {
         error_fn(std::move(test_msg));
@@ -279,7 +283,8 @@ bool Moonraker::upload(PrintHostUpload upload_data, ProgressFn progress_fn, Erro
                         "%1%: upload response missing result.item.path, falling back to original filename `%2%`")
                         % name % uploaded_path;
                 }
-                moonraker_started_print = ptree.get<bool>("result.print_started", false);
+                moonraker_started_print = ptree.get<bool>("result.print_started", false) ||
+                                          ptree.get<bool>("result.print_queued", false);
             } catch (const std::exception &ex) {
                 BOOST_LOG_TRIVIAL(warning) << boost::format(
                     "%1%: could not parse upload response (%2%); falling back to original filename")
@@ -308,7 +313,8 @@ bool Moonraker::upload(PrintHostUpload upload_data, ProgressFn progress_fn, Erro
     if (!result)
         return false;
 
-    // Fallback when Moonraker ignored the `print` flag or reported print_started=false.
+    // Fallback only when Moonraker neither started nor queued the print, i.e. it did
+    // not honour the `print` flag at all.
     if (want_start && !uploaded_path.empty() && !moonraker_started_print) {
         wxString start_msg;
         if (!start_print(start_msg, uploaded_path)) {