MacGui: Change Help Menu to m0k links

- Fix crash caused by x264 NSTextView in PrefsController.mm if no prefs .plist is present

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2_5.1@403 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index adbc23c43235e0b6b3d328f3ce95ff0e86cd5128..85d9071c2631c429cc59c2cf53af6198047e5aa1 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1631,13 +1631,13 @@ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow
 - (IBAction) OpenHomepage: (id) sender
 {
     [[NSWorkspace sharedWorkspace] openURL: [NSURL
-        URLWithString:@"http://mediafork.dynalias.com/"]];
+        URLWithString:@"http://handbrake.m0k.org/"]];
 }
 
 - (IBAction) OpenForums: (id) sender
 {
     [[NSWorkspace sharedWorkspace] openURL: [NSURL
-        URLWithString:@"http://mediafork.dynalias.com/forum/"]];
+        URLWithString:@"http://handbrake.m0k.org/forum/"]];
 }
 
 

diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index d5c40a0dc681dd4de1fe33b25ec7dae6ae46032e..24fe33cbe1cffe2d1188eb5b8f46d1599ef80a85 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -19,6 +19,7 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
+               <integer>29</integer>
                <integer>21</integer>
        </array>
        <key>IBSystem Version</key>

diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 3b273f33bcd2905bc9b732233c470178bf57488c..80ed24763dc47602b86b16defa0c9d73af4404e2 100644 (file)
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index ad1e6f6d326f8be4e8efdbd3dc52a6a382b24c40..e65be0be0766e1445722bd08fc8584fad84df7da 100644 (file)
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -240,7 +240,10 @@
                                         NSOnState : NSOffState];
                
        /* Insert default DefAdvanced x264 Flag here */
+       if ([defaults stringForKey:@"DefAdvancedx264Flags"]!=NULL)
+       {
        [fDefAdvancedx264FlagsView setString:[defaults stringForKey:@"DefAdvancedx264Flags"]];
+       }