diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-03-02 17:23:23 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-03-02 17:23:23 -0500 |
| commit | 7fb107cd37a09787c5cfa590688944b3bcb2bab8 (patch) | |
| tree | bdd5bbf3eb5d4594dc9ae5b90bf553f14ee0946d /openbox/screen.c | |
| parent | ac255432b46617fe01fd40fd02fdea878893ce3c (diff) | |
| parent | f542c5143ac115937c5ee8f3a229e557383cd180 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/actions/execute.c
openbox/event.c
openbox/openbox.c
openbox/openbox.h
Diffstat (limited to 'openbox/screen.c')
| -rw-r--r-- | openbox/screen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbox/screen.c b/openbox/screen.c index cd46c53b..3b9f66ff 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -481,7 +481,7 @@ void screen_resize(void) OBT_PROP_SETA32(obt_root(ob_screen), NET_DESKTOP_GEOMETRY, CARDINAL, geometry, 2); - if (ob_state() == OB_STATE_STARTING) + if (ob_state() != OB_STATE_RUNNING) return; screen_update_areas(); |