Mercurial > hg > easyhg
changeset 611:864cf6bc6eff
Fix incorrect signal in recent files action; if hg not found in last location, check for it in path (e.g. if it was previously in an installation-specific location that has since been overridden by a new installation)
author | Chris Cannam |
---|---|
date | Tue, 03 Jul 2012 15:26:30 +0100 |
parents | 90da5af6a952 |
children | ad163f8f6236 |
files | src/mainwindow.cpp src/settingsdialog.cpp |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mainwindow.cpp Tue Jul 03 13:25:54 2012 +0100 +++ b/src/mainwindow.cpp Tue Jul 03 15:26:30 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())); } }
--- a/src/settingsdialog.cpp Tue Jul 03 13:25:54 2012 +0100 +++ b/src/settingsdialog.cpp Tue Jul 03 15:26:30 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 != "") {