From a426099957cc273636c7b7d3caf8cf2f5e64ae87 Mon Sep 17 00:00:00 2001 From: Fredrik Modeen Date: Fri, 12 Sep 2008 19:08:31 +0000 Subject: [PATCH] fixes CID 455 Check for NULL and use std::nothrow git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27465 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/glteapot/TeapotWindow.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/apps/glteapot/TeapotWindow.cpp b/src/apps/glteapot/TeapotWindow.cpp index dd5276413a..f477cf98d7 100644 --- a/src/apps/glteapot/TeapotWindow.cpp +++ b/src/apps/glteapot/TeapotWindow.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include "TeapotWindow.h" @@ -34,9 +35,8 @@ TeapotWindow::TeapotWindow(BRect rect, char* name, window_type wt, ulong somethi AddChild(subView); bounds = subView->Bounds(); - fObjectView = new ObjectView(bounds, "objectView", B_FOLLOW_ALL_SIDES, type); - subView->AddChild(fObjectView); - fObjectView = fObjectView; + fObjectView = new(std::nothrow) ObjectView(bounds, "objectView", B_FOLLOW_ALL_SIDES, type); + subView->AddChild(fObjectView); BMenuItem* item; msg.AddInt32("num", 256); @@ -163,8 +163,9 @@ TeapotWindow::TeapotWindow(BRect rect, char* name, window_type wt, ulong somethi bool TeapotWindow::QuitRequested() { -// printf("closing \n"); - fObjectView->EnableDirectMode(false); + if (fObjectView != NULL) + fObjectView->EnableDirectMode(false); + be_app->PostMessage(B_QUIT_REQUESTED); return true; } @@ -173,9 +174,10 @@ TeapotWindow::QuitRequested() void TeapotWindow::DirectConnected(direct_buffer_info* info) { - if (fObjectView) + if (fObjectView != NULL) { fObjectView->DirectConnected(info); - fObjectView->EnableDirectMode(true); + fObjectView->EnableDirectMode(true); + } }