Solving issue 1567: "RT 4.0.9.137 hangs on OSX 10.6.8"

This commit is contained in:
natureh 510
2012-10-17 23:38:39 +02:00
parent d7210a6b16
commit 47a2132f53
2 changed files with 5 additions and 3 deletions

View File

@@ -408,6 +408,8 @@ void Options::setDefaults () {
rtSettings.iccDirectory = Glib::ustring(sysRoot) + Glib::ustring("\\System32\\spool\\drivers\\color"); rtSettings.iccDirectory = Glib::ustring(sysRoot) + Glib::ustring("\\System32\\spool\\drivers\\color");
else else
rtSettings.iccDirectory = "C:\\WINDOWS\\System32\\spool\\drivers\\color"; rtSettings.iccDirectory = "C:\\WINDOWS\\System32\\spool\\drivers\\color";
#elif defined __APPLE__
rtSettings.iccDirectory = "/library/ColorSync/Profiles/Displays";
#else #else
rtSettings.iccDirectory = "/usr/share/color/icc"; rtSettings.iccDirectory = "/usr/share/color/icc";
#endif #endif

View File

@@ -1020,9 +1020,9 @@ void Preferences::storePreferences () {
moptions.customProfileBuilder = txtCustProfBuilderPath->get_text(); moptions.customProfileBuilder = txtCustProfBuilderPath->get_text();
moptions.rtSettings.monitorProfile = monProfile->get_filename (); moptions.rtSettings.monitorProfile = monProfile->get_filename ();
moptions.rtSettings.autoMonitorProfile = cbAutoMonProfile->get_active (); moptions.rtSettings.autoMonitorProfile = cbAutoMonProfile->get_active ();
moptions.rtSettings.iccDirectory = iccDir->get_current_folder (); moptions.rtSettings.iccDirectory = iccDir->get_filename ();
moptions.rtSettings.colorimetricIntent = intent->get_active_row_number (); moptions.rtSettings.colorimetricIntent = intent->get_active_row_number ();
if (sdcurrent->get_active ()) if (sdcurrent->get_active ())
moptions.startupDir = STARTUPDIR_CURRENT; moptions.startupDir = STARTUPDIR_CURRENT;