Merge branch 'uemis-next'

No reason to keep this in a separate branch. If we decide to make a 2.1.1
release we'll simply cherry pick only the fixes.

1 files changed, 3 insertions, 1 deletions

diff --git a/main.c b/main.c
index 20f3fb97e..ca3722383 100644
--- a/main.c
+++ b/main.c
@@ -242,7 +242,9 @@ int main(int argc, char **argv)
 
 	init_ui(&argc, &argv);
 
-#ifdef DEBUGFILE
+#if DEBUGFILE > 1
+	debugfile = stderr;
+#elif defined(DEBUGFILE)
 	debugfilename = (char *)subsurface_default_filename();
 	strncpy(debugfilename + strlen(debugfilename) - 3, "log", 3);
 	if (g_mkdir_with_parents(g_path_get_dirname(debugfilename), 0664) != 0 ||