Merge branch 'master' into next

[i3/i3] / src / util.c

diff --git a/src/util.c b/src/util.c
index 8273e0cf0150cda981d42af87b3f1171e336f10b..e623ce81b822e0121d2641665145b2da2402f05d 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1,3 +1,5 @@
+#undef I3__FILE__
+#define I3__FILE__ "util.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -303,6 +305,7 @@ void i3_restart(bool forget_layout) {
     char *restart_filename = forget_layout ? NULL : store_restart_layout();
 
     kill_configerror_nagbar(true);
+    kill_commanderror_nagbar(true);
 
     restore_geometry();