Merge pull request #3 from kleinerm/master

Pull the 3.0.10 RC3 with some bug fix to PsychJava installation.
Psychtoolbox-3 · May 28, 2012 · 5f82e14 · 5f82e14
2 parents 2518639 + e713cec
commit 5f82e14
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Psychtoolbox/PsychtoolboxPostInstallRoutine.m b/Psychtoolbox/PsychtoolboxPostInstallRoutine.m
@@ -477,10 +477,10 @@ function PsychtoolboxPostInstallRoutine(isUpdate, flavor)
             % Look for the first instance of PsychJava in the classpath and
             % replace it with the new one.  All other instances will be
             % ignored.
-            if isempty(strfind('PsychJava', fileContents{i}))
+            if isempty(strfind(fileContents{i}, 'PsychJava'))
                 newFileContents{j, 1} = fileContents{i}; %#ok<AGROW>
                 j = j + 1;
-            elseif ~isempty(strfind('PsychJava', fileContents{i})) & ~pathInserted %#ok<AND2>
+            elseif ~isempty(strfind(fileContents{i}, 'PsychJava')) & ~pathInserted %#ok<AND2>
                 newFileContents{j, 1} = path_PsychJava; %#ok<AGROW>
                 pathInserted = 1;
                 j = j + 1;