diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-09 20:49:54 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-09 20:49:54 +0000 |
| commit | 4d55a8b8254dff61fdc7b1959f6aef7eafbd9439 (patch) | |
| tree | fb5e56131a7c8b729641c70e7a87883ebaea5186 /macosx/plugins/DFXVideo/macsrc | |
| parent | 71d6c56271e2650b1a2f5149521a5b1896084710 (diff) | |
| download | pcsxr-4d55a8b8254dff61fdc7b1959f6aef7eafbd9439.tar.gz | |
Patch 10767 (Durandal_1707).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72138 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFXVideo/macsrc')
4 files changed, 6 insertions, 6 deletions
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m index 3cb3d02b..13f9ff6f 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m @@ -184,7 +184,7 @@ void ReadConfig(void) /* load from preferences */ [keyValues release]; - keyValues = [[defaults dictionaryForKey:PrefsKey] retain]; + keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy]; [fpsCounter setIntValue:[[keyValues objectForKey:@"FPS Counter"] intValue]]; [autoFullScreen setIntValue:[[keyValues objectForKey:@"Auto Full Screen"] intValue]]; diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m index 9c760ccd..dc4e7dc4 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m @@ -351,9 +351,8 @@ void BlitScreen16NS(unsigned char * surf,long x,long y) else { szDebugText[0]=0; - if (szMenuBuf) { - strncat(szDispBuf, szMenuBuf, 63 - strlen(szDispBuf)); - } + + strncat(szDispBuf, szMenuBuf, 63 - strlen(szDispBuf)); } NSRect rect = [[[self openGLContext] view] bounds]; diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h index ff9af258..d88bd867 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h +++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h @@ -26,7 +26,7 @@ extern NSWindow *gameWindow; extern PluginWindowController *gameController; -@interface PluginWindowController : NSWindowController +@interface PluginWindowController : NSWindowController <NSWindowDelegate> { IBOutlet NSOpenGLView *glView; diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m index 17e76477..81f5f32e 100644 --- a/macosx/plugins/DFXVideo/macsrc/drawgl.m +++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m @@ -116,7 +116,8 @@ unsigned long ulInitDisplay(void) // OPEN GAME WINDOW PluginWindowController *windowController = [PluginWindowController openGameView]; glView = [windowController getOpenGLView]; - [[windowController window] setTitle:[NSString stringWithCString:pCaptionText]]; + NSString *title = [NSString stringWithCString:pCaptionText encoding:NSUTF8StringEncoding]; + [[windowController window] setTitle:title]; return (unsigned long)[windowController window]; } |