aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-02-11 11:52:07 (GMT)
committerfluxgen <fluxgen>2002-02-11 11:52:07 (GMT)
commit27842d01fa83363402562721b2d9ca320f8e0fba (patch)
tree02973e138b7ac9fe3c34552cc63ef2e851837022 /src
parentefa5e85503e31b75737089aa045991455120910e (diff)
downloadfluxbox-27842d01fa83363402562721b2d9ca320f8e0fba.zip
fluxbox-27842d01fa83363402562721b2d9ca320f8e0fba.tar.bz2
removed catch
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 52ef317..52eca9c 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.22 2002/02/10 22:48:19 fluxgen Exp $ 25// $Id: Screen.cc,v 1.23 2002/02/11 11:52:07 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
@@ -453,18 +453,13 @@ resource(rm, screenname, altscreenname)
453 continue; 453 continue;
454 454
455 if (attrib.map_state != IsUnmapped) { 455 if (attrib.map_state != IsUnmapped) {
456 FluxboxWindow *tempwin = 0; 456
457 try { 457 FluxboxWindow *win = new FluxboxWindow(children[i], this);
458 tempwin = new FluxboxWindow(children[i], this); 458 if (!win->isManaged()) {
459 } catch (FluxboxWindow::Error err) { 459 delete win;
460 FluxboxWindow::showError(err); 460 win = 0;
461 delete tempwin;
462 tempwin = 0;
463 } catch (...) {
464 cerr<<"FATAL: Unknown exception"<<endl;
465 } 461 }
466 462
467 FluxboxWindow *win = fluxbox->searchWindow(children[i]);
468 if (win) { 463 if (win) {
469 XMapRequestEvent mre; 464 XMapRequestEvent mre;
470 mre.window = children[i]; 465 mre.window = children[i];