Fixed crash when unpacking NDS ROMs in ToolkitForm

evandixon · Dec 6, 2016 · 7c8d7a2 · 7c8d7a2
1 parent d478ca0
commit 7c8d7a2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/DotNet3dsToolkit/Misc/GenericNDSRom.vb b/DotNet3dsToolkit/Misc/GenericNDSRom.vb
@@ -640,7 +640,11 @@ Public Class GenericNDSRom
     ''' <returns></returns>
     Public ReadOnly Property ExtractionProgress As Single Implements IReportProgress.Progress
         Get
-            Return CurrentExtractProgress / CurrentExtractMax
+            If CurrentExtractMax = 0 Then
+                Return 0
+            Else
+                Return CurrentExtractProgress / CurrentExtractMax
+            End If
         End Get
     End Property
 

diff --git a/ToolkitForm/Form1.vb b/ToolkitForm/Form1.vb
@@ -84,11 +84,16 @@ Public Class Form1
     End Sub
 
     Private Sub OnUnpackProgressedInternal(sender As Object, e As ProgressReportedEventArgs)
-        If pbProgress.Style = ProgressBarStyle.Marquee Then
+        If e.IsIndeterminate OrElse e.Progress = Single.NaN Then
+            pbProgress.Style = ProgressBarStyle.Marquee
+        Else
             pbProgress.Style = ProgressBarStyle.Continuous
         End If
 
-        pbProgress.Value = e.Progress * pbProgress.Maximum
+        If Not SIngle.IsNaN(e.Progress) Then
+            pbProgress.Value = e.Progress * pbProgress.Maximum
+        End If
+
         lblStatus.Text = String.Format("Extracting...")
     End Sub