MacGui: improve previous commit a bit.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5631 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 13 insertions, 2 deletions

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 605ffd5d8..80dba2a9d 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1999,11 +1999,22 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
             {
                 /* User chose to override our warning and scan the physical dvd anyway, at their own peril. on an encrypted dvd this produces massive log files and fails */
                 cancelScanDecrypt = 0;
-                [self writeToActivityLog: "User overrode copy-proteciton warning - trying to open physical dvd without decryption"];
+                [self writeToActivityLog:"User overrode copy-protection warning - trying to open physical dvd without decryption"];
             }
             
         }
-        dlclose(dvdcss);
+        else if (dvdcss != NULL)
+        {
+            /* VLC was found in /Applications so all is well, we can carry on using vlc's libdvdcss.dylib for decrypting if needed */
+            [self writeToActivityLog: "libdvdcss.2.dylib found for decrypting physical dvd"];
+            dlclose(dvdcss);
+        }
+        else
+        {
+            /* User chose to override our warning and scan the physical dvd anyway, at their own peril. on an encrypted dvd this produces massive log files and fails */
+            cancelScanDecrypt = 0;
+            [self writeToActivityLog:"Copy-protection warning disabled in preferences - trying to open physical dvd without decryption"];
+        }
     }
     
     if (cancelScanDecrypt == 0)