16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 03:09:18 +02:00

fix python window double-free

This commit is contained in:
milek7
2019-03-16 21:39:49 +01:00
parent debf0f6eff
commit 7bc59b50e0
3 changed files with 8 additions and 6 deletions

View File

@@ -470,7 +470,7 @@ void eu07_application::on_focus_change(bool focus) {
}
GLFWwindow *
eu07_application::window( int const Windowindex, bool visible, int width, int height, GLFWmonitor *monitor ) {
eu07_application::window( int const Windowindex, bool visible, int width, int height, GLFWmonitor *monitor, bool keep_ownership ) {
if( Windowindex >= 0 ) {
return (
@@ -483,9 +483,11 @@ eu07_application::window( int const Windowindex, bool visible, int width, int he
glfwWindowHint( GLFW_VISIBLE, visible );
auto *childwindow = glfwCreateWindow( width, height, "eu07helper", monitor, m_windows.front() );
if( childwindow != nullptr ) {
m_windows.emplace_back( childwindow );
}
if (!childwindow)
return nullptr;
if (keep_ownership)
m_windows.emplace_back( childwindow );
glfwFocusWindow(m_windows.front()); // restore focus to main window