Skip to content

Commit 67b75f1

Browse files
PeterStrickPeterStrick
committed
Version 1.7 - Part 1: Bugfixes
1 parent ca6bd2c commit 67b75f1

File tree

8 files changed

+203
-61
lines changed

8 files changed

+203
-61
lines changed

‎ViVeTool-GUI.FeatureScanner/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("1.6.1.0")>
35-
<Assembly: AssemblyFileVersion("1.6.1.0")>
34+
<Assembly: AssemblyVersion("1.6.2.0")>
35+
<Assembly: AssemblyFileVersion("1.6.2.0")>

‎ViVeTool-GUI.FeatureScanner/ScannerUI.vb

Lines changed: 64 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,13 @@ Public Class ScannerUI
165165
Dim CopyExAndClose As New RadTaskDialogButton With {
166166
.Text = "Copy Exception and Close"
167167
}
168-
AddHandler CopyExAndClose.Click, New EventHandler(Sub() My.Computer.Clipboard.SetText(ex.ToString))
168+
AddHandler CopyExAndClose.Click, New EventHandler(Sub()
169+
Try
170+
My.Computer.Clipboard.SetText(ex.ToString)
171+
Catch clipex As Exception
172+
'Do nothing
173+
End Try
174+
End Sub)
169175

170176
Dim RTD As New RadTaskDialogPage With {
171177
.Caption = " An Exception occurred",
@@ -255,32 +261,54 @@ Public Class ScannerUI
255261
.RedirectStandardOutput = True 'Enables Redirection of Standard Output
256262
End With
257263

264+
Dim RTD_SymChk As New RadTaskDialogPage With {
265+
.Caption = " An Error occurred",
266+
.Heading = "An Error occurred",
267+
.Text = "An Error occurred while downloading the symbol files." & vbNewLine & vbNewLine & "Check if yo have access to symchk.exe and that your Antivirus isn't blocking it.",
268+
.Icon = RadTaskDialogIcon.ShieldErrorRedBar
269+
}
270+
258271
'Get the .pdb files of C:\Windows\*.* - Recursively
259-
Proc.StartInfo.Arguments = "/r ""C:\Windows"" /oc """ & My.Settings.SymbolPath & """ /cn"
260-
Proc.Start()
261-
Proc.BeginErrorReadLine()
262-
Proc.BeginOutputReadLine()
263-
Proc.WaitForExit()
264-
Proc.CancelOutputRead()
265-
Proc.CancelErrorRead()
272+
Try
273+
Proc.StartInfo.Arguments = "/r ""C:\Windows"" /oc """ & My.Settings.SymbolPath & """ /cn"
274+
Proc.Start()
275+
Proc.BeginErrorReadLine()
276+
Proc.BeginOutputReadLine()
277+
Proc.WaitForExit()
278+
Proc.CancelOutputRead()
279+
Proc.CancelErrorRead()
280+
Catch ex As Exception
281+
'Show the Message Box
282+
RadTaskDialog.ShowDialog(RTD_SymChk)
283+
End Try
266284

267285
'Get the .pdb files of C:\Program Files\*.* - Recursively
268-
Proc.StartInfo.Arguments = "/r ""C:\Program Files"" /oc """ & My.Settings.SymbolPath & """ /cn"
269-
Proc.Start()
270-
Proc.BeginErrorReadLine()
271-
Proc.BeginOutputReadLine()
272-
Proc.WaitForExit()
273-
Proc.CancelOutputRead()
274-
Proc.CancelErrorRead()
286+
Try
287+
Proc.StartInfo.Arguments = "/r ""C:\Program Files"" /oc """ & My.Settings.SymbolPath & """ /cn"
288+
Proc.Start()
289+
Proc.BeginErrorReadLine()
290+
Proc.BeginOutputReadLine()
291+
Proc.WaitForExit()
292+
Proc.CancelOutputRead()
293+
Proc.CancelErrorRead()
294+
Catch ex As Exception
295+
'Show the Message Box
296+
RadTaskDialog.ShowDialog(RTD_SymChk)
297+
End Try
275298

276299
'Get the .pdb files of C:\Program Files (x86)\*.* - Recursively
277-
Proc.StartInfo.Arguments = "/r ""C:\Program Files (x86)"" /oc """ & My.Settings.SymbolPath & """ /cn"
278-
Proc.Start()
279-
Proc.BeginErrorReadLine()
280-
Proc.BeginOutputReadLine()
281-
Proc.WaitForExit()
282-
Proc.CancelOutputRead()
283-
Proc.CancelErrorRead()
300+
Try
301+
Proc.StartInfo.Arguments = "/r ""C:\Program Files (x86)"" /oc """ & My.Settings.SymbolPath & """ /cn"
302+
Proc.Start()
303+
Proc.BeginErrorReadLine()
304+
Proc.BeginOutputReadLine()
305+
Proc.WaitForExit()
306+
Proc.CancelOutputRead()
307+
Proc.CancelErrorRead()
308+
Catch ex As Exception
309+
'Show the Message Box
310+
RadTaskDialog.ShowDialog(RTD_SymChk)
311+
End Try
284312

285313
'Disable the current tab and move to the Scan PDB Tab
286314
Invoke(Sub()
@@ -512,7 +540,13 @@ Public Class ScannerUI
512540
Dim CopyExAndClose As New RadTaskDialogButton With {
513541
.Text = "Copy Exception and Close"
514542
}
515-
AddHandler CopyExAndClose.Click, New EventHandler(Sub() My.Computer.Clipboard.SetText(ex.ToString))
543+
AddHandler CopyExAndClose.Click, New EventHandler(Sub()
544+
Try
545+
My.Computer.Clipboard.SetText(ex.ToString)
546+
Catch clipex As Exception
547+
'Do nothing
548+
End Try
549+
End Sub)
516550

517551
Dim RTD As New RadTaskDialogPage With {
518552
.Caption = " An Exception occurred",
@@ -557,7 +591,13 @@ Public Class ScannerUI
557591
Dim CopyExAndClose As New RadTaskDialogButton With {
558592
.Text = "Copy Exception and Close"
559593
}
560-
AddHandler CopyExAndClose.Click, New EventHandler(Sub() My.Computer.Clipboard.SetText(ex.ToString))
594+
AddHandler CopyExAndClose.Click, New EventHandler(Sub()
595+
Try
596+
My.Computer.Clipboard.SetText(ex.ToString)
597+
Catch clipex As Exception
598+
'Do nothing
599+
End Try
600+
End Sub)
561601

562602
Dim RTD As New RadTaskDialogPage With {
563603
.Caption = " An Exception occurred",

‎vivetool-gui/AboutAndSettings.vb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,13 @@ Public NotInheritable Class AboutAndSettings
9393
Dim CopyExAndClose As New RadTaskDialogButton With {
9494
.Text = "Copy Exception and Close"
9595
}
96-
AddHandler CopyExAndClose.Click, New EventHandler(Sub() My.Computer.Clipboard.SetText(wex.ToString))
96+
AddHandler CopyExAndClose.Click, New EventHandler(Sub()
97+
Try
98+
My.Computer.Clipboard.SetText(wex.ToString)
99+
Catch clipex As Exception
100+
'Do nothing
101+
End Try
102+
End Sub)
97103

98104
'Fancy Message Box
99105
Dim RTD As New RadTaskDialogPage With {

0 commit comments

Comments
 (0)