Move use of console option WaitForEnter for consistency on all errors

cyanfish · Jun 10, 2015 · bab9e45 · bab9e45
1 parent 881f25d
commit bab9e45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/NAPS2.Console/AutomatedScanning.cs b/NAPS2.Console/AutomatedScanning.cs
@@ -127,11 +127,6 @@ public void Execute()
  }
 
  scannedImages = null;
-
- if (options.WaitForEnter)
- {
- Console.ReadLine();
- }
  }
 
  private void ImportImages()

diff --git a/NAPS2.Console/Program.cs b/NAPS2.Console/Program.cs
@@ -50,8 +50,12 @@ static void Main(string[] args)
  }
  catch (Exception ex)
  {
- KernelManager.Kernel.Get<ILogger>().FatalException("An error occurred that caused the console application to close.", ex);
+ KernelManager.Kernel.Get<ILogger>()
+ .FatalException("An error occurred that caused the console application to close.", ex);
  System.Console.WriteLine(ConsoleResources.UnexpectedError);
+ }
+ finally
+ {
  if (options.WaitForEnter)
  {
  System.Console.ReadLine();