← Back to branch summary

~compiz-team/compiz/0.9.9

« back to all changes in this revision

Viewing changes to src/window.cpp

  • Committer: Tarmac
  • Author(s): Stephen M. Webb
  • Date: 2012-12-04 17:26:54 UTC
  • mfrom: (3499.1.2 compiz)
  • Revision ID: tarmac-20121204172654-5qd2600sxjukx2ui
Move plugin initialization code out of assert() macro so it still runs even with NDEBUG defined (lp: #1085581). Fixes: https://bugs.launchpad.net/bugs/1085581.

Approved by Didier Roche.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/window.cpp
6115
6115
    }
6116
6116
 
6117
6117
    /* TODO: bailout properly when objectInitPlugins fails */
6118
 
    assert (CompPlugin::windowInitPlugins (this));
 
6118
    bool init_succeeded = CompPlugin::windowInitPlugins (this);
 
6119
    assert (init_succeeded);
 
6120
    if (!init_succeeded)
 
6121
      return;
6119
6122
 
6120
6123
    recalcActions ();
6121
6124
    priv->updateIconGeometry ();