Bump version to RC2v0.4.2-rc2

11 files changed, 15 insertions, 14 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb275710..f91a5392 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,13 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 0.4.2-rc1
+## 0.4.2-rc2
 
 ### Packaging
 
 - Minimum Rust version has been bumped to 1.37.0
 - Added Rust features `x11` and `wayland` to pick backends, with both enabled by default
-- Capitalized the default Alacritty.desktop file
 - Capitalized the Alacritty.desktop file
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index e30425ee..14723464 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15,9 +15,9 @@ dependencies = [
 
 [[package]]
 name = "alacritty"
-version = "0.4.2-rc1"
+version = "0.4.2-rc2"
 dependencies = [
- "alacritty_terminal 0.4.2-rc1",
+ "alacritty_terminal 0.4.2-rc2",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -45,7 +45,7 @@ dependencies = [
 
 [[package]]
 name = "alacritty_terminal"
-version = "0.4.2-rc1"
+version = "0.4.2-rc2"
 dependencies = [
  "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml
index 4a05e06d..9a972605 100644
--- a/alacritty/Cargo.toml
+++ b/alacritty/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alacritty"
-version = "0.4.2-rc1"
+version = "0.4.2-rc2"
 authors = ["Christian Duerr <contact@christianduerr.com>", "Joe Wilm <joe@jwilm.com>"]
 license = "Apache-2.0"
 description = "GPU-accelerated terminal emulator"
diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml
index 3e40e637..152470ea 100644
--- a/alacritty_terminal/Cargo.toml
+++ b/alacritty_terminal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alacritty_terminal"
-version = "0.4.2-rc1"
+version = "0.4.2-rc2"
 authors = ["Christian Duerr <contact@christianduerr.com>", "Joe Wilm <joe@jwilm.com>"]
 license = "Apache-2.0"
 description = "Library for writing terminal emulators"
diff --git a/extra/alacritty.man b/extra/alacritty.man
index a40a650f..97c55b1c 100644
--- a/extra/alacritty.man
+++ b/extra/alacritty.man
@@ -1,4 +1,4 @@
-.TH ALACRITTY "1" "August 2018" "alacritty 0.4.2-rc1" "User Commands"
+.TH ALACRITTY "1" "August 2018" "alacritty 0.4.2-rc2" "User Commands"
 .SH NAME
 alacritty \- a cross-platform, gpu-accelerated terminal emulator
 .SH "SYNOPSIS"
diff --git a/extra/linux/io.alacritty.Alacritty.appdata.xml b/extra/linux/io.alacritty.Alacritty.appdata.xml
index 8fc719c8..f6e3b1b5 100644
--- a/extra/linux/io.alacritty.Alacritty.appdata.xml
+++ b/extra/linux/io.alacritty.Alacritty.appdata.xml
@@ -28,7 +28,7 @@ However, it does allow configuration of many aspects of the terminal.</p>
   <url type="homepage">https://github.com/alacritty/alacritty</url>
   <url type="bugtracker">https://github.com/alacritty/alacritty/issues</url>
   <releases>
-    <release version="0.4.2-rc1" date="2019-06-16" unix_timestamp="1560694196"/>
+    <release version="0.4.2-rc2" date="2019-06-16" unix_timestamp="1560694196"/>
   </releases>
   <update_contact>https://github.com/alacritty/alacritty/blob/master/CONTRIBUTING.md#contact</update_contact>
   <developer_name>Joe Wilm</developer_name>
diff --git a/extra/linux/redhat/alacritty.spec b/extra/linux/redhat/alacritty.spec
index 67b636ad..5ff84041 100644
--- a/extra/linux/redhat/alacritty.spec
+++ b/extra/linux/redhat/alacritty.spec
@@ -1,5 +1,5 @@
 Name:          alacritty
-Version:       0.4.2-rc1
+Version:       0.4.2-rc2
 Release:       1%{?dist}
 Summary:       A cross-platform, GPU enhanced terminal emulator
 License:       ASL 2.0
diff --git a/extra/linux/snap/snapcraft.yaml b/extra/linux/snap/snapcraft.yaml
index 86f4aa77..62524505 100644
--- a/extra/linux/snap/snapcraft.yaml
+++ b/extra/linux/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: alacritty
-version: '0.4.2-rc1'
+version: '0.4.2-rc2'
 summary: Modern, GPU accelerated terminal emulator
 description: |
   Alacritty is a terminal emulator with a strong focus on simplicity and
diff --git a/extra/osx/Alacritty.app/Contents/Info.plist b/extra/osx/Alacritty.app/Contents/Info.plist
index 5e9f17ec..7b091138 100644
--- a/extra/osx/Alacritty.app/Contents/Info.plist
+++ b/extra/osx/Alacritty.app/Contents/Info.plist
@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.4.2-rc1</string>
+  <string>0.4.2-rc2</string>
   <key>CFBundleSupportedPlatforms</key>
   <array>
     <string>MacOSX</string>
diff --git a/extra/windows/wix/alacritty.wxs b/extra/windows/wix/alacritty.wxs
index 88bf9820..610a699f 100644
--- a/extra/windows/wix/alacritty.wxs
+++ b/extra/windows/wix/alacritty.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
-    <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.4.2-rc1" Manufacturer="Alacritty">
+    <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.4.2-rc2" Manufacturer="Alacritty">
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
         <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
         <Icon Id="AlacrittyIco" SourceFile="..\extra\windows\alacritty.ico"/>
diff --git a/font/src/ft/mod.rs b/font/src/ft/mod.rs
index d2a99cae..d393b63f 100644
--- a/font/src/ft/mod.rs
+++ b/font/src/ft/mod.rs
@@ -215,7 +215,6 @@ impl FreeTypeRasterizer {
         let mut pattern = Pattern::new();
         pattern.add_family(&desc.name);
         pattern.add_pixelsize(size);
-        let hash = pattern.hash();
 
         // Add style to a pattern
         match desc.style {
@@ -230,6 +229,9 @@ impl FreeTypeRasterizer {
             },
         }
 
+        // Hash requested pattern
+        let hash = pattern.hash();
+
         pattern.config_substitute(config, fc::MatchKind::Pattern);
         pattern.default_substitute();