Merge branch 'master' into next

[i3/i3] / src / main.c

diff --git a/src/main.c b/src/main.c
index aefdfb27aa28971b750a092276c52cc4a963b1fb..45cb162c42599d1551730c59622f84a7212b1762 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -284,8 +284,7 @@ int main(int argc, char *argv[]) {
     debug_build = ((strchr(I3_VERSION, '(') - I3_VERSION) > 10);
 
     /* On non-release builds, disable SHM logging by default. */
-    if (!debug_build)
-        shmlog_size = 0;
+    shmlog_size = (debug_build ? 25 * 1024 * 1024 : 0);
 
     start_argv = argv;