diff options
author | fluxgen <fluxgen> | 2003-08-12 12:21:42 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-08-12 12:21:42 (GMT) |
commit | 1f4944abb4c3c1076391412f61c1bb9579e73a12 (patch) | |
tree | d3377b6efdd3ba145cded54f706d6ec83fbde7f6 /src/Screen.cc | |
parent | cb0621a6b6a9470abb507a9fe87bd3d90491d695 (diff) | |
download | fluxbox-1f4944abb4c3c1076391412f61c1bb9579e73a12.zip fluxbox-1f4944abb4c3c1076391412f61c1bb9579e73a12.tar.bz2 |
added shutdown variable to indicate that we are shutting down and dont need to listen to some signals
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index e39dc1c..3396ccf 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Screen.cc,v 1.217 2003/08/12 01:03:25 fluxgen Exp $ | 25 | // $Id: Screen.cc,v 1.218 2003/08/12 12:21:42 fluxgen Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -302,7 +302,8 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
302 | m_altname(altscreenname), | 302 | m_altname(altscreenname), |
303 | m_resource_manager(rm), | 303 | m_resource_manager(rm), |
304 | m_available_workspace_area(new Strut(0, 0, 0, 0)), | 304 | m_available_workspace_area(new Strut(0, 0, 0, 0)), |
305 | m_xinerama_headinfo(0) { | 305 | m_xinerama_headinfo(0), |
306 | m_shutdown(false) { | ||
306 | 307 | ||
307 | Display *disp = FbTk::App::instance()->display(); | 308 | Display *disp = FbTk::App::instance()->display(); |
308 | 309 | ||
@@ -2099,7 +2100,7 @@ void BScreen::shutdown() { | |||
2099 | Display *disp = FbTk::App::instance()->display(); | 2100 | Display *disp = FbTk::App::instance()->display(); |
2100 | rootWindow().setEventMask(NoEventMask); | 2101 | rootWindow().setEventMask(NoEventMask); |
2101 | XSync(disp, False); | 2102 | XSync(disp, False); |
2102 | 2103 | m_shutdown = true; | |
2103 | for_each(m_workspaces_list.begin(), | 2104 | for_each(m_workspaces_list.begin(), |
2104 | m_workspaces_list.end(), | 2105 | m_workspaces_list.end(), |
2105 | mem_fun(&Workspace::shutdown)); | 2106 | mem_fun(&Workspace::shutdown)); |