# HG changeset patch
# User Chris Cannam
# Date 1341414915 -3600
# Node ID 32b8f32f14a65c54dbb817ae1fb4b6013e879326
# Parent  22695de8581c5dfa2bd637c167737460b903ed37# Parent  4d44bad5a8efc55d47d3b503fb7ee67261e05990
Merge

diff -r 22695de8581c -r 32b8f32f14a6 .hgtags
--- a/.hgtags	Tue Jul 03 13:54:18 2012 +0100
+++ b/.hgtags	Wed Jul 04 16:15:15 2012 +0100
@@ -20,3 +20,4 @@
 9b300409c184d47d57fba49341b2a1818b7fd0bc easyhg_v1.2
 8bcf7ce9b1d209b94f71593545fc5de7c008f5a3 easyhg_v1.2_win32_2
 abfef4acceca78078fe0c3b7fa8794f9ec77a4d3 easyhg_v1.2.1
+aade37785eca08d98afa7d12a66a181e1a2f4e2c easyhg_v1.2.2
diff -r 22695de8581c -r 32b8f32f14a6 easyhg.pro
--- a/easyhg.pro	Tue Jul 03 13:54:18 2012 +0100
+++ b/easyhg.pro	Wed Jul 04 16:15:15 2012 +0100
@@ -1,5 +1,5 @@
 
-CONFIG += debug
+CONFIG += release
 
 TEMPLATE = app
 TARGET = EasyMercurial
diff -r 22695de8581c -r 32b8f32f14a6 easyhg.wxs
--- a/easyhg.wxs	Tue Jul 03 13:54:18 2012 +0100
+++ b/easyhg.wxs	Wed Jul 04 16:15:15 2012 +0100
@@ -2,13 +2,13 @@
 
   <Product
       Name="EasyMercurial" 
-      Id="CDD72D35-518B-49E2-A389-B3F7C1AE289D" 
+      Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="1.2.0" 
+      Version="1.2.2" 
       UpgradeCode="B82DFDA9-B9DE-49BC-93E5-0B96F9DEB04B"
       Manufacturer="Queen Mary, University of London">
-
+    
     <Package
         Id="*"
         Keywords="Installer"
@@ -20,6 +20,8 @@
         Compressed="yes" 
         SummaryCodepage="1252"/>
 
+    <MajorUpgrade DowngradeErrorMessage="A later version of EasyMercurial is already installed. Setup will now exit."/>
+
     <Media Id="1" Cabinet="easyhg.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/>
     <Property Id="DiskPrompt" Value="EasyMercurial Installation [1]"/>
 
diff -r 22695de8581c -r 32b8f32f14a6 src/mainwindow.cpp
--- a/src/mainwindow.cpp	Tue Jul 03 13:54:18 2012 +0100
+++ b/src/mainwindow.cpp	Wed Jul 04 16:15:15 2012 +0100
@@ -2894,7 +2894,7 @@
     }
     foreach (QString r, recent) {
         QAction *a = m_recentMenu->addAction(r);
-        connect(a, SIGNAL(activated()), this, SLOT(recentMenuActivated()));
+        connect(a, SIGNAL(triggered()), this, SLOT(recentMenuActivated()));
     }
 }
 
diff -r 22695de8581c -r 32b8f32f14a6 src/settingsdialog.cpp
--- a/src/settingsdialog.cpp	Tue Jul 03 13:54:18 2012 +0100
+++ b/src/settingsdialog.cpp	Wed Jul 04 16:15:15 2012 +0100
@@ -268,7 +268,7 @@
     QSettings settings;
     settings.beginGroup("Locations");
     QString hg = settings.value("hgbinary", "").toString();
-    if (hg == "") {
+    if (hg == "" || !QFile(hg).exists()) {
         hg = findInPath("hg", m_installPath, true);
     }
     if (hg != "") {