Merge from master

Mamesaver.Test/Properties/AssemblyInfo.cs

@@ -15,5 +15,5 @@
 [assembly: Guid("98f0d731-fc1c-4659-8eeb-7489331621d6")]
 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]

Mamesaver/Properties/AssemblyInfo.cs

@@ -33,5 +33,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.0.*")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("2.0.0.*")]
+[assembly: AssemblyFileVersion("2.0.0.0")]

Mamesaver/Windows/UserActivityHook.cs

@@ -487,13 +487,12 @@ public void Dispose()
 
         protected virtual void Dispose(bool disposing)
         {
-            //uninstall hooks and do not throw exceptions
+            if (!disposing) return;
+
             Stop(true, true, false);
         }
 
-        /// <summary>
-        /// Destruction.
-        /// </summary>
+
         ~UserActivityHook() => Dispose(false);
 
         /// <summary>

MamesaverDeploy/MamesaverDeploy.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="9ba27e17-63e0-4204-a7b9-5bc5231386e5" Name="Mamesaver" Language="1033" Version="1.0.0.0" Manufacturer="Mladen Mihajlovic" UpgradeCode="ffa9f413-26d4-4376-821f-57bcd6141175">
+  <Product Id="9ba27e17-63e0-4204-a7b9-5bc5231386e5" Name="Mamesaver" Language="1033" Version="2.0.0.0" Manufacturer="Mladen Mihajlovic" UpgradeCode="ffa9f413-26d4-4376-821f-57bcd6141175">
     <Package InstallerVersion="200" Compressed="yes" />
 
     <Media Id="1" Cabinet="Mamesaver.cab" EmbedCab="yes" CompressionLevel="high" />

README.md

@@ -2,7 +2,7 @@
 
 - [Introduction](#introduction)
 - [Requirements](#requirements)
- - [Installation](#installation)
+- [Installation](#installation)
 - [Usage](#usage)
 - [Configuration](#configuration)
 - [Hotkeys](#hotkeys)
@@ -12,7 +12,7 @@
 - [Open source](#open-source)
 
 
-v1.1
+v2.0
 Licensed under The MIT License
 
 [![Build status](https://ci.appveyor.com/api/projects/status/2b8n7te1bq8rf1pp?svg=true)](https://ci.appveyor.com/project/mmihajlovic/mamesaver)
@@ -21,9 +21,10 @@ Licensed under The MIT License
 
 Mamesaver is a Windows screen saver that runs MAME with a random game for specified intervals of time.
 
-![General Settings](Resources/SettingsPanel1.png) 
-![Game List](Resources/SettingsPanel2.png)
+<img src="Resources/SettingsPanel1.png" width="250" title="General Setting"> <img src="Resources/SettingsPanel2.png" width="250" title="Game List"> <img src="Resources/SettingsPanel3.png" width="250" title="Layout Settings">
+<img src="Resources/SettingsPanel4.png" width="250" title="Hotkey Settings"> <img src="Resources/SettingsPanel5.png" width="250" title="Advanced Settings">
 
+<img src="Resources/Splash.jpg" width="250" title="Splash Screen with caption"> <img src="Resources/Game.jpg" width="250" title="Game Playing with caption">
 
 ### REQUIREMENTS
 * Microsoft .NET 4.6