From a0628ff50b0ca0c594cee15d21a5853a9652a43d Mon Sep 17 00:00:00 2001
From: supermerill <merill@fr.fr>
Date: Tue, 12 Feb 2019 10:54:45 +0100
Subject: [PATCH] bugfix merge

---
 src/slic3r/GUI/GLCanvas3D.cpp | 6 +++---
 src/slic3r/GUI/GLCanvas3D.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 0e56562c6..43cfa38ed 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -526,17 +526,17 @@ std::string GLCanvas3D::Bed::_detect_type() const
                 {
                     if (boost::contains(curr->name, "SL1"))
                     {
-                        type = SL1;
+                        type = "SL1";
                         break;
                     }
                     else if (boost::contains(curr->name, "MK3") || boost::contains(curr->name, "MK2.5"))
                     {
-                        type = MK3;
+                        type = "MK3";
                         break;
                     }
                     else if (boost::contains(curr->name, "MK2"))
                     {
-                        type = MK2;
+                        type = "MK2";
                         break;
                     }
                 }
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index 49a7f2aa5..d4d51bd5c 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -227,7 +227,7 @@ class GLCanvas3D
         Bed();
 
 #if ENABLE_REWORKED_BED_SHAPE_CHANGE
-        EType get_type() const { return m_type; }
+        std::string get_type() const { return m_type; }
 #endif // ENABLE_REWORKED_BED_SHAPE_CHANGE
 
         bool is_prusa() const;