Index: src/ch/ch.cpp
===================================================================
diff -u -N -ra0a0c78670588f86c6be24afb076e6b304441563 -r8dd3566d66a35a662872eaaa45eef5049e71c3dc
--- src/ch/ch.cpp	(.../ch.cpp)	(revision a0a0c78670588f86c6be24afb076e6b304441563)
+++ src/ch/ch.cpp	(.../ch.cpp)	(revision 8dd3566d66a35a662872eaaa45eef5049e71c3dc)
@@ -25,6 +25,7 @@
 #include <Dbghelp.h>
 #include "CrashDlg.h"
 #include "../common/version.h"
+#include "TCommandLineParser.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -205,6 +206,11 @@
 	// ================================= Crash handling =======================================
 	SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter);
 
+	// ================================= Handle command line ==================================
+	// parse the command line this early, so we can support as much options as possible in the future
+	// (i.e. override the defaults used below)
+	m_cmdLineParser.ParseCommandLine(::GetCommandLine());
+
 	// ================================= Configuration ========================================
 	CString strPath;
 	CString strCfgPath;