From bc6d6fb54bf63ed3757af1e204a9f50a2a2765cf Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Wed, 29 Feb 2012 02:45:42 +0000 Subject: [PATCH] #4788 "export TRANSMISSION_HOME=" broken in Mac client --- macosx/Controller.m | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/macosx/Controller.m b/macosx/Controller.m index 85ae89e2a..f6924f8a9 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -320,8 +320,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy [NSLocalizedString(@"GB", "Memory size - gigabytes") UTF8String], [NSLocalizedString(@"TB", "Memory size - terabytes") UTF8String]); - //use this instead of tr_getDefaultConfigDir("Transmission") so we are sure to get the "real" Application Support directory - const char * configDir = [[[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) objectAtIndex: 0] stringByAppendingPathComponent: @"Transmission"] UTF8String]; + const char * configDir = tr_getDefaultConfigDir("Transmission"); fLib = tr_sessionInit("macosx", configDir, YES, &settings); tr_bencFree(&settings); @@ -3207,7 +3206,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy + (NSHeight([fWindow frame]) - NSHeight([[fWindow contentView] frame])); //contentView to window if (windowSize.height < minHeight) - windowSize.height =minHeight; + windowSize.height = minHeight; else { NSSize maxSize = [scrollView convertSize: [[fWindow screen] visibleFrame].size fromView: nil];