Changeset 2168 for branches/eraser6/6.0/Eraser.Util/VolumeInfo.cs

Timestamp:

6/13/2010 6:21:46 AM (3 years ago)

Author:

lowjoel

Message:

Fix crash when a volume is connected but not mounted.

File:

• branches/eraser6/6.0/Eraser.Util/VolumeInfo.cs (modified) (11 diffs)

branches/eraser6/6.0/Eraser.Util/VolumeInfo.cs

@@ -91 +91 @@
         private List<string> GetLocalVolumeMountPoints()
         {
+            if (!IsReady)
+                throw new InvalidOperationException("The volume has not been mounted or is not " +
+                    "currently ready.");
+
             List<string> result = new List<string>();
 
@@ -365 +369 @@
             get
             {
+                if (!IsReady)
+                    throw new InvalidOperationException("The volume has not been mounted or is not " +
+                        "currently ready.");
                 return (DriveType)KernelApi.NativeMethods.GetDriveType(VolumeId);
             }
@@ -376 +383 @@
             get
             {
+                if (!IsReady)
+                    throw new InvalidOperationException("The volume has not been mounted or is not " +
+                        "currently ready.");
+
                 uint clusterSize, sectorSize, freeClusters, totalClusters;
                 if (KernelApi.NativeMethods.GetDiskFreeSpace(VolumeId, out clusterSize,
@@ -394 +405 @@
             get
             {
+                if (!IsReady)
+                    throw new InvalidOperationException("The volume has not been mounted or is not " +
+                        "currently ready.");
+
                 uint clusterSize, sectorSize, freeClusters, totalClusters;
                 if (KernelApi.NativeMethods.GetDiskFreeSpace(VolumeId, out clusterSize,
@@ -412 +427 @@
             get
             {
+                if (!IsReady)
+                    throw new InvalidOperationException("The volume has not been mounted or is not " +
+                        "currently ready.");
+
                 ulong freeBytesAvailable, totalNumberOfBytes, totalNumberOfFreeBytes;
                 if (KernelApi.NativeMethods.GetDiskFreeSpaceEx(VolumeId, out freeBytesAvailable,
@@ -440 +459 @@
             get
             {
+                if (!IsReady)
+                    throw new InvalidOperationException("The volume has not been mounted or is not " +
+                        "currently ready.");
+
                 ulong result, dummy;
                 if (KernelApi.NativeMethods.GetDiskFreeSpaceEx(VolumeId, out dummy,
@@ -458 +481 @@
             get
             {
+                if (!IsReady)
+                    throw new InvalidOperationException("The volume has not been mounted or is not " +
+                        "currently ready.");
+
                 ulong result, dummy;
                 if (KernelApi.NativeMethods.GetDiskFreeSpaceEx(VolumeId, out dummy,
@@ -476 +503 @@
             get
             {
+                if (!IsReady)
+                    throw new InvalidOperationException("The volume has not been mounted or is not " +
+                        "currently ready.");
+
                 ulong result, dummy;
                 if (KernelApi.NativeMethods.GetDiskFreeSpaceEx(VolumeId, out result,
@@ -495 +526 @@
             get
             {
+                if (!IsReady)
+                    throw new InvalidOperationException("The volume has not been mounted or is not " +
+                        "currently ready.");
+
                 List<VolumeInfo> result = new List<VolumeInfo>();
                 StringBuilder nextMountpoint = new StringBuilder(
@@ -528 +563 @@
             get
             {
+                if (!IsReady)
+                    throw new InvalidOperationException("The volume has not been mounted or is not " +
+                        "currently ready.");
+
                 return (VolumeType == DriveType.Network ?
                     GetNetworkMountPoints() : GetLocalVolumeMountPoints()).AsReadOnly();
@@ -538 +577 @@
         public bool IsMounted
         {
-            get { return MountPoints.Count != 0; }
+            get { return IsReady && MountPoints.Count != 0; }
         }