ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - 8c3f6ec929d6

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jason Maltzen (jmaltzen) - 9 years ago 2015-12-31 05:50:21
jason.maltzen@unsanctioned.net

Fix an error with searching for application data directories

1 file changed with 4 insertions and 5 deletions:

FileUtils.cs

0 comments (0 inline, 0 general)

FileUtils.cs

➞

Show inline comments

 using System;
 namespace DesertPaintLab
+{
     public class FileUtils
+    {
         public FileUtils()
+        {
+        }
         public static string FindApplicationResourceDirectory(string dirname)
+        {
             string dirPath = System.IO.Path.Combine(
                     System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                     dirname);
             if (System.IO.Directory.Exists(dirPath))
+            {
                 return dirPath;
+            }
             dirPath = System.IO.Path.Combine(
                 System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                 "data",
                 dirname);
-            if (!System.IO.Directory.Exists(dirPath))
             if (System.IO.Directory.Exists(dirPath))
+            {
                 // not found
                 dirPath = null;
                 return dirPath;
+            }
             // try "Resources" in case this is a Mac app bundle
             dirPath = System.IO.Path.Combine(
                 Environment.GetFolderPath(Environment.SpecialFolder.Resources), "data", dirname);
             if (System.IO.Directory.Exists(dirPath))
+            {
                 return dirPath;
+            }
             // try "Resources" in case this is a Mac app bundle
             dirPath = System.IO.Path.Combine(
                 Environment.GetFolderPath(Environment.SpecialFolder.Resources), dirname);
             if (System.IO.Directory.Exists(dirPath))
+            {
                 return dirPath;
+            }
             dirPath = System.IO.Path.Combine(
                 System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                 "Resources", "data",
                 dirname);
-            if (!System.IO.Directory.Exists(dirPath))
             if (System.IO.Directory.Exists(dirPath))
+            {
                 // not found
-                dirPath = null;
+                return dirPath;
+            }
             dirPath = System.IO.Path.Combine(
                 System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                 "Resources",
                 dirname);
             if (!System.IO.Directory.Exists(dirPath))
+            {
                 // not found
                 dirPath = null;
+            }
             return dirPath;
+        }
         public static string FindApplicationResourceFile(string filename)
+        {
             // start with the location of the executable
             string filePath = System.IO.Path.Combine(
                     System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                     filename);
             if (!System.IO.File.Exists(filePath))
+            {
                 filePath = System.IO.Path.Combine(
                     System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                     "data",

0 comments (0 inline, 0 general)