From 8db7af4f5fe6a558a97b56310b9cfb65962e2917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Wed, 22 Jan 2014 17:00:30 +0100 Subject: [PATCH] LaunchBox: Fixed uninitialized member CID 1162820 --- src/apps/launchbox/NamePanel.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/apps/launchbox/NamePanel.cpp b/src/apps/launchbox/NamePanel.cpp index e0d556709f..053aae349e 100644 --- a/src/apps/launchbox/NamePanel.cpp +++ b/src/apps/launchbox/NamePanel.cpp @@ -32,7 +32,8 @@ NamePanel::NamePanel(const char* label, const char* text, BWindow* window, | B_AUTO_UPDATE_SIZE_LIMITS), fWindow(window), fTarget(target), - fMessage(message) + fMessage(message), + fSavedTargetWindowFeel(B_NORMAL_WINDOW_FEEL) { BButton* defaultButton = new BButton(B_TRANSLATE("OK"), new BMessage(MSG_PANEL_OK)); @@ -72,7 +73,7 @@ NamePanel::NamePanel(const char* label, const char* text, BWindow* window, SetDefaultButton(defaultButton); fNameTC->MakeFocus(true); - if (fWindow && fWindow->Lock()) { + if (fWindow != NULL && fWindow->Lock()) { fSavedTargetWindowFeel = fWindow->Feel(); if (fSavedTargetWindowFeel != B_NORMAL_WINDOW_FEEL) fWindow->SetFeel(B_NORMAL_WINDOW_FEEL); @@ -85,7 +86,8 @@ NamePanel::NamePanel(const char* label, const char* text, BWindow* window, NamePanel::~NamePanel() { - if (fWindow && fWindow->Lock()) { + if (fSavedTargetWindowFeel != B_NORMAL_WINDOW_FEEL + && fWindow != NULL && fWindow->Lock()) { fWindow->SetFeel(fSavedTargetWindowFeel); fWindow->Unlock(); }