fixup! First hacks on OOBE help.help

1 files changed, 11 insertions, 11 deletions

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index f8756549b..75cdedc00 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -569,24 +569,24 @@ get_offsets (vector<Offset>& offsets)
 }
 
 
-wxString
-bitmap_path (string name)
+boost::filesystem::path
+bitmap_directory ()
 {
-	boost::filesystem::path base;
-
 #ifdef DCPOMATIC_DEBUG
 	/* Hack to allow OS X to find icons when running from the source tree */
 	char* path = getenv ("DCPOMATIC_GRAPHICS");
 	if (path) {
-		base = path;
-	} else {
-		base = shared_path();
+		return path;
 	}
-#else
-	base = shared_path();
 #endif
 
-	boost::filesystem::path p = base / String::compose("%1.png", name);
-	return std_to_wx (p.string());
+	return shared_path();
 }
 
+
+wxString
+bitmap_path (string name)
+{
+	boost::filesystem::path p = bitmap_directory() / String::compose("%1.png", name);
+	return std_to_wx (p.string());
+}