summaryrefslogtreecommitdiff
path: root/openbox/openbox.c
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/openbox.c')
-rw-r--r--openbox/openbox.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c
index fb1e75d0..eb7934e0 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -121,7 +121,7 @@ gint main(gint argc, gchar **argv)
{
gchar *program_name;
- state = OB_STATE_STARTING;
+ ob_set_state(OB_STATE_STARTING);
/* initialize the locale */
if (!setlocale(LC_ALL, ""))
@@ -367,9 +367,10 @@ gint main(gint argc, gchar **argv)
reconfigure = FALSE;
- state = OB_STATE_RUNNING;
+ ob_set_state(OB_STATE_RUNNING);
ob_main_loop_run(ob_main_loop);
- state = OB_STATE_EXITING;
+ ob_set_state(reconfigure ?
+ OB_STATE_RECONFIGURING : OB_STATE_EXITING);
if (!reconfigure) {
dock_remove_all();
@@ -709,3 +710,8 @@ ObState ob_state()
{
return state;
}
+
+void ob_set_state(ObState s)
+{
+ state = s;
+}