Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PowerStatus] The menu item quit doesn't close the Tracker

Browse Source 
* Fixes #13790
This commit is contained in:
Janus 2017-11-21 18:10:30 +01:00
parent f4a1f9c06a
commit d18b272d3e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/apps/powerstatus/PowerStatusView.cpp
View File

@ -580,7 +580,8 @@ PowerStatusView::_NotifyLowBattery()
PowerStatusReplicant::PowerStatusReplicant(BRect frame, int32 resizingMode,
bool inDeskbar)
:
PowerStatusView(NULL, frame, resizingMode, -1, inDeskbar)
PowerStatusView(NULL, frame, resizingMode, -1, inDeskbar),
fReplicated(false)
{
_Init();
_LoadSettings();
@ -600,7 +601,8 @@ PowerStatusReplicant::PowerStatusReplicant(BRect frame, int32 resizingMode,
PowerStatusReplicant::PowerStatusReplicant(BMessage* archive)
:
PowerStatusView(archive)
PowerStatusView(archive),
fReplicated(true)
{
_Init();
_LoadSettings();
@ -612,7 +614,7 @@ PowerStatusReplicant::~PowerStatusReplicant()
if (fMessengerExist)
delete fExtWindowMessenger;
if (fExtendedWindow && fExtendedWindow->Lock()) {
if (fExtendedWindow != NULL && fExtendedWindow->Lock()) {
fExtendedWindow->Quit();
fExtendedWindow = NULL;
}
@ -781,6 +783,12 @@ PowerStatusReplicant::_Quit()
if (fInDeskbar) {
BDeskbar deskbar;
deskbar.RemoveItem(kDeskbarItemName);
} else if (fReplicated) {
BDragger *dragger = dynamic_cast<BDragger*>(ChildAt(0));
if (dragger != NULL) {
BMessenger messenger(dragger);
messenger.SendMessage(new BMessage(B_TRASH_TARGET));
}
} else
be_app->PostMessage(B_QUIT_REQUESTED);
}

1
src/apps/powerstatus/PowerStatusView.h
View File

@ -94,6 +94,7 @@ private:
void _SaveSettings();
void _OpenExtendedWindow();
bool fReplicated;
private:
BWindow* fExtendedWindow;