Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Turri <enricoturri@seznam.cz>2020-02-27 16:55:27 +0300
committerEnrico Turri <enricoturri@seznam.cz>2020-02-27 16:55:27 +0300
commitd6b86b5e2b7841f7a91f4ef3a3a0b08807bbfbe8 (patch)
tree1df407aecfeb86f193214f4bdbf619caaafd2f67 /src/slic3r/GUI/GLCanvas3DManager.hpp
parentabca180f9f141812c322da6032d133da013a554a (diff)
Workaround to remove crash when closing PrusaSlicer on OSX 10.9.5
Diffstat (limited to 'src/slic3r/GUI/GLCanvas3DManager.hpp')
-rw-r--r--src/slic3r/GUI/GLCanvas3DManager.hpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/slic3r/GUI/GLCanvas3DManager.hpp b/src/slic3r/GUI/GLCanvas3DManager.hpp
index 940e0230a..c7301f2b4 100644
--- a/src/slic3r/GUI/GLCanvas3DManager.hpp
+++ b/src/slic3r/GUI/GLCanvas3DManager.hpp
@@ -68,6 +68,17 @@ public:
void detect() const;
};
+#if ENABLE_HACK_CLOSING_ON_OSX_10_9_5
+#ifdef __APPLE__
+ struct OSInfo
+ {
+ int major{ 0 };
+ int minor{ 0 };
+ int micro{ 0 };
+ };
+#endif //__APPLE__
+#endif // ENABLE_HACK_CLOSING_ON_OSX_10_9_5
+
private:
enum EMultisampleState : unsigned char
{
@@ -81,6 +92,11 @@ private:
CanvasesMap m_canvases;
wxGLContext* m_context;
static GLInfo s_gl_info;
+#if ENABLE_HACK_CLOSING_ON_OSX_10_9_5
+#ifdef __APPLE__
+ static OSInfo s_os_info;
+#endif //__APPLE__
+#endif // ENABLE_HACK_CLOSING_ON_OSX_10_9_5
bool m_gl_initialized;
static EMultisampleState s_multisample;
static bool s_compressed_textures_supported;