summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorTomas Chvatal <tchvatal@suse.cz>2011-11-15 12:33:49 +0100
committerTomas Chvatal <tchvatal@suse.cz>2011-11-15 12:34:35 +0100
commit4fe54ea11ed82dd662d0132585c199ec9f3a6c95 (patch)
treed19f1b374e85e0ce36ce1942bf1e5ebe5a764066 /desktop
parent28e36d54a0f4bbe4fddacbaf2f51ff25c76ce2d5 (diff)
Instead of returning out of function just skip its calling.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/unx/source/start.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 940a99793fc2..6152e4cd8d98 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -697,9 +697,6 @@ static void extend_library_path (const char *new_element)
static void
exec_javaldx (Args *args)
{
-#ifndef SOLAR_JAVA
- return;
-#endif
char newpath[4096];
sal_uInt32 nArgs;
rtl_uString *pApp;
@@ -858,8 +855,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
exec_pagein (args);
/* javaldx */
+#ifdef SOLAR_JAVA
if (!args->bInhibitJavaLdx)
exec_javaldx (args);
+#endif
do
{