aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Screen.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 2b60866..52ef317 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.21 2002/02/08 13:35:03 fluxgen Exp $ 25// $Id: Screen.cc,v 1.22 2002/02/10 22:48:19 fluxgen Exp $
26 26
27// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
28// library 28// library
@@ -231,7 +231,7 @@ resource(rm, screenname, altscreenname)
231 231
232 event_mask = ColormapChangeMask | EnterWindowMask | PropertyChangeMask | 232 event_mask = ColormapChangeMask | EnterWindowMask | PropertyChangeMask |
233 SubstructureRedirectMask | KeyPressMask | KeyReleaseMask | 233 SubstructureRedirectMask | KeyPressMask | KeyReleaseMask |
234 ButtonPressMask | ButtonReleaseMask| SubstructureNotifyMask; 234 ButtonPressMask | ButtonReleaseMask;//| SubstructureNotifyMask;
235 235
236 XErrorHandler old = XSetErrorHandler((XErrorHandler) anotherWMRunning); 236 XErrorHandler old = XSetErrorHandler((XErrorHandler) anotherWMRunning);
237 XSelectInput(getBaseDisplay()->getXDisplay(), getRootWindow(), event_mask); 237 XSelectInput(getBaseDisplay()->getXDisplay(), getRootWindow(), event_mask);
@@ -1592,11 +1592,9 @@ void BScreen::shutdown(void) {
1592 } 1592 }
1593 1593
1594 { 1594 {
1595 Icons::iterator it = iconList.begin(); 1595 while (!iconList.empty()) {
1596 Icons::iterator it_end = iconList.end(); 1596 iconList.back()->restore();
1597 for (; it != it_end; ++it) { 1597 delete iconList.back(); // the window removes it self from iconlist
1598 (*it)->restore();
1599 delete (*it);
1600 } 1598 }
1601 } 1599 }
1602 1600