From 110318fb6935acfa95ed33e23d833d1fe3265ca6 Mon Sep 17 00:00:00 2001 From: nigel <> Date: Mon, 19 Sep 2005 06:02:47 +0000 Subject: [PATCH] Some more 10.4 fixes by Kirk Kerekes --- BasiliskII/src/MacOSX/PrefsEditor.mm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/BasiliskII/src/MacOSX/PrefsEditor.mm b/BasiliskII/src/MacOSX/PrefsEditor.mm index 57c20eee..53efd9c5 100644 --- a/BasiliskII/src/MacOSX/PrefsEditor.mm +++ b/BasiliskII/src/MacOSX/PrefsEditor.mm @@ -131,7 +131,7 @@ extern string UserPrefsPath; // from prefs_unix.cpp edited = NO; devs = @"/dev"; - home = NSHomeDirectory(); + home = [NSHomeDirectory() retain]; volsDS = [TableDS new]; SCSIds = [TableDS new]; @@ -140,10 +140,9 @@ extern string UserPrefsPath; // from prefs_unix.cpp NSLog (@"%s - Can't create NSImageCell?", __PRETTY_FUNCTION__); blank = [NSImage new]; - locked = [NSImage alloc]; - if ( [locked initWithContentsOfFile: - [[NSBundle mainBundle] - pathForImageResource: @"nowrite.icns"]] == nil ) + locked = [[NSImage alloc] initWithContentsOfFile: + [[NSBundle mainBundle] pathForImageResource: @"nowrite.icns"]]; + if (locked == nil ) NSLog(@"%s - Couldn't open write protection image", __PRETTY_FUNCTION__); return self; @@ -151,11 +150,11 @@ extern string UserPrefsPath; // from prefs_unix.cpp - (void) dealloc { - [volsDS dealloc]; - [SCSIds dealloc]; - [lockCell dealloc]; - [locked dealloc]; - [blank dealloc]; + [volsDS release]; + [SCSIds release]; + [lockCell release]; + [blank release]; + [locked release]; [super dealloc]; }