aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorokan2018-01-02 14:04:58 +0000
committerokan2018-01-02 14:04:58 +0000
commitec8f2600eda19cbe97c55f5053713ff9691fbd02 (patch)
tree346125a72fd693e69efce5342ec29241c4d4d12a
parentfeec43aa443deb6168a8cd6a356b76a46667653b (diff)
downloadcwm-ec8f2600eda19cbe97c55f5053713ff9691fbd02.tar.gz
Only exec the fallback when in CWM_EXEC_WM state.
Broken quit noticed by Ve Telko.
-rw-r--r--calmwm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/calmwm.c b/calmwm.c
index 319beae..a69bf86 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: calmwm.c,v 1.106 2017/12/29 20:09:19 okan Exp $
+ * $OpenBSD: calmwm.c,v 1.107 2018/01/02 14:04:58 okan Exp $
*/
#include <sys/types.h>
@@ -131,11 +131,11 @@ main(int argc, char **argv)
}
}
x_teardown();
- if (cwm_status == CWM_EXEC_WM)
+ if (cwm_status == CWM_EXEC_WM) {
u_exec(Conf.wm_argv);
-
- warnx("'%s' failed to start, restarting fallback", Conf.wm_argv);
- u_exec(fallback);
+ warnx("'%s' failed to start, restarting fallback", Conf.wm_argv);
+ u_exec(fallback);
+ }
return(0);
}