marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Qt editor/Linux: Fix crash on player removal 

See 69fff71abf
qteditor
Lukas Werling 2016-08-01 13:54:35 +02:00
parent e5f2e4e58a
commit 582c82c159
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/platform/C4WindowSDL.cpp
View File

@ -57,6 +57,7 @@ static void SetMultisamplingAttributes(int samples)
C4Window * C4Window::Init(WindowKind windowKind, C4AbstractApp * pApp, const char * Title, const C4Rect * size)
{
eKind = windowKind;
#ifdef WITH_QT_EDITOR
if (windowKind == W_Viewport)
{
@ -103,8 +104,16 @@ bool C4Window::ReInit(C4AbstractApp* pApp)
void C4Window::Clear()
{
SDL_DestroyWindow(window);
window = 0;
if (window) SDL_DestroyWindow(window);
window = nullptr;
#ifdef WITH_QT_EDITOR
if (eKind == W_Viewport)
{
// embed into editor: Viewport widget creation handled by C4ConsoleQt
::Console.RemoveViewport(static_cast<C4ViewportWindow *>(this));
}
#endif
}
void C4Window::EnumerateMultiSamples(std::vector<int>& samples) const