summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej.hunt@collabora.com>2014-07-21 19:46:16 +0200
committerAndrzej Hunt <andrzej.hunt@collabora.com>2014-07-21 19:46:16 +0200
commitdc1c9770671e0475cc758ccc23df5a1eb8a4337d (patch)
tree24cbe6e1d76595d4fe1b82b3c8f454cf2031332f
parent3a5a4689c102e375c8d30e2498b73fd449d1cb32 (diff)
DON'T USE: ignore unknown args instead of failure.feature/calctiledrendering4
The --protector flag ends up here in unit tests, which causes things to fail -- either we need to make --protector known, or filter it out before hand -- whereby I suspect filtering it out would be difficult to do in a reliable fashion. Change-Id: Iab47a6e24723604df75def2b963e82ba6479318e
-rw-r--r--desktop/source/app/app.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a2df7580e4cd..e9098c231b48 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -656,7 +656,7 @@ void Desktop::Init()
// 2nd office startup should terminate after sending cmdlineargs through pipe
SetBootstrapStatus(BS_TERMINATE);
}
- else if ( !rCmdLineArgs.GetUnknown().isEmpty()
+ else if ( (!rCmdLineArgs.GetUnknown().isEmpty() && false)
|| rCmdLineArgs.IsHelp() || rCmdLineArgs.IsVersion() )
{
// disable IPC thread in an instance that is just showing a help message