From 75fcb2cbc0ad54d91e446150f10954a294d90bfe Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 13 Dec 2011 10:38:02 +0100 Subject: fix the hack that uses cleanlooks under Ubuntu 11.10 - count wasn't the right position in the array - and don't ignore style from commandline Change-Id: I8bc5f169c51adafeb333b0872bb5adbde59d01e7 Reviewed-by: Niels Weber --- installerbuilder/installerbase/installerbase.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'installerbuilder/installerbase/installerbase.cpp') diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp index ae4111a88..9cb542c43 100644 --- a/installerbuilder/installerbase/installerbase.cpp +++ b/installerbuilder/installerbase/installerbase.cpp @@ -103,12 +103,13 @@ int main(int argc, char *argv[]) } if (isUbuntu && is11_10) { - char** newArgv = new char* [argc + 1]; - for (int i = 0; i < argc; ++i) { - newArgv[i] = argv[i]; - } argc++; - newArgv[argc] = const_cast(cleanLooks.data()); + char **newArgv = new char* [argc]; + newArgv[0] = argv[0]; + newArgv[1] = const_cast(cleanLooks.data()); + for (int i = 1; i < argc-1; ++i) { + newArgv[i+1] = argv[i]; + } argv = newArgv; } #endif -- cgit v1.2.3