From 74ab2d24b7b5d006bc52a43976cfaa95a5e6f853 Mon Sep 17 00:00:00 2001 From: Jan Bartipan Date: Tue, 20 Aug 2024 11:32:22 +0200 Subject: [PATCH] ConnectWebViewPanel::get_login_script for refresh wrapped in check if _prusaSlicer_initLogin function (defined by AddUserScript) is already defined (i.e. handle gracefully situation when token refresh happen just before the UserScript gets executed) --- src/slic3r/GUI/WebViewDialog.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index fc53db1b3b..0e3f129402 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -636,7 +636,17 @@ wxString ConnectWebViewPanel::get_login_script(bool refresh) window.__access_token_version = 0; )", #else - refresh ? "console.log('Refreshing login'); _prusaSlicer_initLogin('%s');" : + refresh + ? + R"( + if (window._prusaSlicer_initLogin !== undefined) { + console.log('Refreshing login'); + _prusaSlicer_initLogin('%s'); + } else { + console.log('Refreshing login skipped as no _prusaSlicer_initLogin defined (yet?)'); + } + )" + : R"( function _prusaSlicer_errorHandler(err) { const msg = {