From 3ce981e16c9522a52a035d1904b215a504e33dff Mon Sep 17 00:00:00 2001
From: Oliver Duis <oduis@hotmail.com>
Date: Tue, 8 Mar 2011 16:59:27 +0100
Subject: [PATCH] Replace hardcoded C:\Windows path by auto-search; see issue
 #572

---
 rtdata/options/options.win | 3 ++-
 rtgui/options.cc           | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/rtdata/options/options.win b/rtdata/options/options.win
index 9fa08b938..5eec64322 100644
--- a/rtdata/options/options.win
+++ b/rtdata/options/options.win
@@ -107,7 +107,8 @@ FixRatio=true
 DPI=600
 
 [Color Management]
-ICCDirectory=C:\\WINDOWS\\System32\\spool\\drivers\\color
+# Auto-determined by RT on first start
+# ICCDirectory=
 MonitorProfile=
 Intent=1
 
diff --git a/rtgui/options.cc b/rtgui/options.cc
index ccb5a6194..80bcad79d 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -138,7 +138,11 @@ void Options::setDefaults () {
     rtSettings.darkFramesPath = "";
 	rtSettings.flatFieldsPath = "";
 #ifdef WIN32
-    rtSettings.iccDirectory = "C:/WINDOWS/System32/spool/drivers/color";
+	const gchar* sysRoot = g_getenv("SystemRoot");  // Returns e.g. "c:\Windows"
+	if (sysRoot!=NULL) 
+		rtSettings.iccDirectory = Glib::ustring(sysRoot) + Glib::ustring("\\System32\\spool\\drivers\\color");
+	else 
+		rtSettings.iccDirectory = "C:\\WINDOWS\\System32\\spool\\drivers\\color";
 #else
     rtSettings.iccDirectory = "/usr/share/color/icc";
 #endif