fix crash when icon file not found.

geovens · May 14, 2017 · 6efb605 · 6efb605
1 parent 09908b1
commit 6efb605
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/bin/Color Assistant.exe b/bin/Color Assistant.exe
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 
+v0.1.1 (May. 14, 2017)
+=================
+- Fix crash when icon file not found.
+
 v0.1 (May. 13, 2017)
 =================
 - First beta release.
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyVersion("0.1.1.0")]
+[assembly: AssemblyFileVersion("0.1.1.0")]
diff --git a/src/Root.cs b/src/Root.cs
@@ -71,7 +71,10 @@ public Root()
  Size size = SystemInformation.SmallIconSize;
  trayIcon = new NotifyIcon();
  trayIcon.Text = "Color Assistant";
- trayIcon.Icon = new Icon("icon.ico");
+ if (File.Exists("icon.ico"))
+ trayIcon.Icon = new Icon("icon.ico");
+ else
+ trayIcon.Icon = global::gInk.Properties.Resources.icon;
  trayIcon.ContextMenu = trayMenu;
  trayIcon.Visible = true;
  trayIcon.MouseClick += TrayIcon_Click;