From 3044da04135587ba9dd873917917f2c829cd69ec Mon Sep 17 00:00:00 2001 From: rlv-dan Date: Sun, 9 Aug 2020 17:29:41 +0200 Subject: [PATCH] v2.14 --- Snap2HTML/Properties/AssemblyInfo.cs | 4 ++-- Snap2HTML/ReadMe.txt | 5 +++++ Snap2HTML/frmMain.cs | 15 ++++++++------- Snap2HTML/frmMain_BackgroundWorker.cs | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Snap2HTML/Properties/AssemblyInfo.cs b/Snap2HTML/Properties/AssemblyInfo.cs index 12bbbe4..2acc4b7 100644 --- a/Snap2HTML/Properties/AssemblyInfo.cs +++ b/Snap2HTML/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion( "2.13.0.0" )] -[assembly: AssemblyFileVersion( "2.13.0.0" )] +[assembly: AssemblyVersion( "2.14.0.0" )] +[assembly: AssemblyFileVersion( "2.14.0.0" )] diff --git a/Snap2HTML/ReadMe.txt b/Snap2HTML/ReadMe.txt index dd6172e..a6fdbae 100644 --- a/Snap2HTML/ReadMe.txt +++ b/Snap2HTML/ReadMe.txt @@ -241,6 +241,11 @@ v2.13 (2020-05-05) Fixed an encoding issue causing EncoderFallbackException while saving + v2.14 (2020-08-09) + UNC paths work again (including linking) + Searches returning lots of items should be a bit faster now + And a few smaller fixes as usual + --- End User License Agreement ----------------------------------------------- diff --git a/Snap2HTML/frmMain.cs b/Snap2HTML/frmMain.cs index 161e740..5fa2b15 100644 --- a/Snap2HTML/frmMain.cs +++ b/Snap2HTML/frmMain.cs @@ -61,6 +61,7 @@ namespace Snap2HTML { // parse command line var commandLine = Environment.CommandLine; + commandLine = commandLine.Replace( "-output:", "-outfile:" ); // correct wrong parameter to avoid confusion var splitCommandLine = Arguments.SplitCommandLine(commandLine); var arguments = new Arguments(splitCommandLine); @@ -160,7 +161,7 @@ namespace Snap2HTML } catch( System.Exception ex ) { - MessageBox.Show( "Could not select folder: " + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error ); + MessageBox.Show( "Could not select folder:\n\n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error ); SetRootPath( "", false ); } } @@ -214,13 +215,13 @@ namespace Snap2HTML if( !settings.linkRoot.EndsWith( @"/" ) ) { if( settings.linkRoot.ToLower().StartsWith( @"http" ) ) // web site - { - settings.linkRoot += @"/"; - } + { + settings.linkRoot += @"/"; + } if( Utils.IsWildcardMatch( "?:*", settings.linkRoot, false ) ) // local disk - { - settings.linkRoot += @"\"; - } + { + settings.linkRoot += @"\"; + } if( settings.linkRoot.StartsWith( @"\\" ) ) // unc path { settings.linkRoot += @"\"; diff --git a/Snap2HTML/frmMain_BackgroundWorker.cs b/Snap2HTML/frmMain_BackgroundWorker.cs index 0571e38..41d24cb 100644 --- a/Snap2HTML/frmMain_BackgroundWorker.cs +++ b/Snap2HTML/frmMain_BackgroundWorker.cs @@ -60,7 +60,7 @@ namespace Snap2HTML } catch( System.Exception ex ) { - MessageBox.Show( "Failed to open 'Template.html' for reading...", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error ); + MessageBox.Show( "Failed to open 'Template.html' for reading:\n\n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error ); backgroundWorker.ReportProgress( 0, "An error occurred..." ); return; } @@ -136,7 +136,7 @@ namespace Snap2HTML } catch( Exception ex ) { - MessageBox.Show( "Failed to open file for writing:\n\n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error ); + MessageBox.Show( "Failed to open file for writing:\n\n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error ); backgroundWorker.ReportProgress( 0, "An error occurred..." ); return; }