[haiku-commits] haiku: hrev45024 - in src/apps: workspaces processcontroller networkstatus deskcalc activitymonitor
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 17 Dec 2012 22:46:54 +0100 (CET)
hrev45024 adds 1 changeset to branch 'master'
old head: a4d5ac6a25cf635c201cbb7d20f35b4a73d69e4f
new head: 7fe8b2bf2a3e4b1c258ec9a4ec748f71d8a9e226
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7fe8b2b+%5Ea4d5ac6
----------------------------------------------------------------------------
7fe8b2b: Also lock fAboutWindow before Quit()ting in other apps
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45024
Commit: 7fe8b2bf2a3e4b1c258ec9a4ec748f71d8a9e226
URL: http://cgit.haiku-os.org/haiku/commit/?id=7fe8b2b
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Mon Dec 17 21:46:41 2012 UTC
----------------------------------------------------------------------------
5 files changed, 5 insertions(+), 5 deletions(-)
src/apps/activitymonitor/ActivityView.cpp | 2 +-
src/apps/deskcalc/CalcView.cpp | 2 +-
src/apps/networkstatus/NetworkStatusView.cpp | 2 +-
src/apps/processcontroller/ProcessController.cpp | 2 +-
src/apps/workspaces/Workspaces.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/src/apps/activitymonitor/ActivityView.cpp
b/src/apps/activitymonitor/ActivityView.cpp
index fc4f32e..ad6e5cd 100644
--- a/src/apps/activitymonitor/ActivityView.cpp
+++ b/src/apps/activitymonitor/ActivityView.cpp
@@ -602,7 +602,7 @@ ActivityView::~ActivityView()
delete fSystemInfoHandler;
// replicant deleted, destroy the about window
- if (fAboutWindow != NULL)
+ if (fAboutWindow != NULL && fAboutWindow->Lock())
fAboutWindow->Quit();
}
diff --git a/src/apps/deskcalc/CalcView.cpp b/src/apps/deskcalc/CalcView.cpp
index b2af685..db30055 100644
--- a/src/apps/deskcalc/CalcView.cpp
+++ b/src/apps/deskcalc/CalcView.cpp
@@ -185,7 +185,7 @@ CalcView::~CalcView()
free(fKeypadDescription);
// replicant deleted, destroy the about window
- if (fAboutWindow != NULL)
+ if (fAboutWindow != NULL && fAboutWindow->Lock())
fAboutWindow->Quit();
}
diff --git a/src/apps/networkstatus/NetworkStatusView.cpp
b/src/apps/networkstatus/NetworkStatusView.cpp
index ccbdb85..8738aac 100644
--- a/src/apps/networkstatus/NetworkStatusView.cpp
+++ b/src/apps/networkstatus/NetworkStatusView.cpp
@@ -139,7 +139,7 @@ NetworkStatusView::NetworkStatusView(BMessage* archive)
NetworkStatusView::~NetworkStatusView()
{
- if (fAboutWindow != NULL)
+ if (fAboutWindow != NULL && fAboutWindow->Lock())
fAboutWindow->Quit();
}
diff --git a/src/apps/processcontroller/ProcessController.cpp
b/src/apps/processcontroller/ProcessController.cpp
index fbf3127..5a4b2ff 100644
--- a/src/apps/processcontroller/ProcessController.cpp
+++ b/src/apps/processcontroller/ProcessController.cpp
@@ -206,7 +206,7 @@ ProcessController::~ProcessController()
gPCView = NULL;
// replicant deleted, destroy the about window
- if (fAboutWindow != NULL)
+ if (fAboutWindow != NULL && fAboutWindow->Lock())
fAboutWindow->Quit();
}
diff --git a/src/apps/workspaces/Workspaces.cpp
b/src/apps/workspaces/Workspaces.cpp
index f5d5de5..3dd2af7 100644
--- a/src/apps/workspaces/Workspaces.cpp
+++ b/src/apps/workspaces/Workspaces.cpp
@@ -374,7 +374,7 @@ WorkspacesView::WorkspacesView(BMessage* archive)
WorkspacesView::~WorkspacesView()
{
- if (fAboutWindow != NULL)
+ if (fAboutWindow != NULL && fAboutWindow->Lock())
fAboutWindow->Quit();
}
Other related posts:
- » [haiku-commits] haiku: hrev45024 - in src/apps: workspaces processcontroller networkstatus deskcalc activitymonitor - jscipione
