From 5679438e64a5f46d0687b516975931fec5b55e8f Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Thu, 30 Apr 2020 08:37:48 +0200
Subject: [PATCH 1/2] Added missing namespace qualification for
 Slic3r::GUI::format in Http.cpp

---
 src/slic3r/Utils/Http.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
index 1f1b6d306..a16aac5b5 100644
--- a/src/slic3r/Utils/Http.cpp
+++ b/src/slic3r/Utils/Http.cpp
@@ -74,11 +74,11 @@ struct CurlGlobalInit
                                "PrusaSlicer will be unable to establish secure "
                                "network connections.");
             else
-                message = Slic3r::format(
+                message = Slic3r::GUI::format(
 					_L("PrusaSlicer detected system SSL certificate store in: %1%"),
                     bundle);
 
-            message += "\n" + Slic3r::format(
+            message += "\n" + Slic3r::GUI::format(
 				_L("To specify the system certificate store manually, please "
                    "set the %1% environment variable to the correct CA bundle "
                    "and restart the application."),

From bc34928ea8a8ac0af2cc3b590b15135f148fa84f Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Thu, 30 Apr 2020 11:32:14 +0200
Subject: [PATCH 2/2] Follow-up of previous commit (Slic3r::GUI::format issues)
 Another missing namespace qualification caused infinite recursion

---
 src/slic3r/GUI/format.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/format.hpp b/src/slic3r/GUI/format.hpp
index 5cb3aed4c..bc6fe7b1b 100644
--- a/src/slic3r/GUI/format.hpp
+++ b/src/slic3r/GUI/format.hpp
@@ -29,7 +29,7 @@ inline wxString format_wxstr(const wxString& fmt, TArgs&&... args) {
 }
 template<typename... TArgs>
 inline std::string format(const wxString& fmt, TArgs&&... args) {
-	return format(fmt.ToUTF8().data(), std::forward<TArgs>(args)...);
+    return Slic3r::format(fmt.ToUTF8().data(), std::forward<TArgs>(args)...);
 }
 
 } // namespace GUI