i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LaunchBox: Fixed uninitialized member CID 1162820

Browse Source
This commit is contained in:
Stephan Aßmus
2014-01-22 17:41:51 +01:00
parent 68f8b94e2a
commit 8db7af4f5f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/launchbox/NamePanel.cpp
+5 -3
View File
@@ -32,7 +32,8 @@ NamePanel::NamePanel(const char* label, const char* text, BWindow* window,
| B_AUTO_UPDATE_SIZE_LIMITS), | B_AUTO_UPDATE_SIZE_LIMITS),
fWindow(window), fWindow(window),
fTarget(target), fTarget(target),
fMessage(message) fMessage(message),
fSavedTargetWindowFeel(B_NORMAL_WINDOW_FEEL)
{ {
BButton* defaultButton = new BButton(B_TRANSLATE("OK"), BButton* defaultButton = new BButton(B_TRANSLATE("OK"),
new BMessage(MSG_PANEL_OK)); new BMessage(MSG_PANEL_OK));
@@ -72,7 +73,7 @@ NamePanel::NamePanel(const char* label, const char* text, BWindow* window,
SetDefaultButton(defaultButton); SetDefaultButton(defaultButton);
fNameTC->MakeFocus(true); fNameTC->MakeFocus(true);
if (fWindow && fWindow->Lock()) { if (fWindow != NULL && fWindow->Lock()) {
fSavedTargetWindowFeel = fWindow->Feel(); fSavedTargetWindowFeel = fWindow->Feel();
if (fSavedTargetWindowFeel != B_NORMAL_WINDOW_FEEL) if (fSavedTargetWindowFeel != B_NORMAL_WINDOW_FEEL)
fWindow->SetFeel(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() NamePanel::~NamePanel()
{ {
if (fWindow && fWindow->Lock()) { if (fSavedTargetWindowFeel != B_NORMAL_WINDOW_FEEL
&& fWindow != NULL && fWindow->Lock()) {
fWindow->SetFeel(fSavedTargetWindowFeel); fWindow->SetFeel(fSavedTargetWindowFeel);
fWindow->Unlock(); fWindow->Unlock();
} }