Mercurial > hg > sonic-visualiser
changeset 2306:a1c14880404b
Merge from branch by-id
author | Chris Cannam |
---|---|
date | Wed, 17 Jul 2019 14:28:24 +0100 (2019-07-17) |
parents | a54082a29106 (diff) 332df8c4562b (current diff) |
children | a8dbf75ddac7 |
files | main/MainWindow.cpp main/MainWindow.h main/main.cpp repoint-lock.json repoint-project.json |
diffstat | 4 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/main/MainWindow.cpp Wed Jul 17 13:14:05 2019 +0100 +++ b/main/MainWindow.cpp Wed Jul 17 14:28:24 2019 +0100 @@ -3190,8 +3190,6 @@ void MainWindow::browseRecordedAudio() { - if (!m_recordTarget) return; - QString path = RecordDirectory::getRecordContainerDirectory(); if (path == "") path = RecordDirectory::getRecordDirectory(); if (path == "") return;
--- a/main/main.cpp Wed Jul 17 13:14:05 2019 +0100 +++ b/main/main.cpp Wed Jul 17 14:28:24 2019 +0100 @@ -238,7 +238,7 @@ cerr << SV_VERSION << endl; exit(0); } - + svSystemSpecificInitialisation(); #ifdef Q_OS_MAC
--- a/repoint-lock.json Wed Jul 17 13:14:05 2019 +0100 +++ b/repoint-lock.json Wed Jul 17 14:28:24 2019 +0100 @@ -4,13 +4,13 @@ "pin": "62987b6d6a3b" }, "svcore": { - "pin": "2e2497cba59e" + "pin": "85b9b466a59f" }, "svgui": { - "pin": "0e971e3d93e2" + "pin": "ac0a8addabcf" }, "svapp": { - "pin": "ad5917362158" + "pin": "155008f1bf10" }, "checker": { "pin": "c8c17e51aab0"
--- a/repoint-project.json Wed Jul 17 13:14:05 2019 +0100 +++ b/repoint-project.json Wed Jul 17 14:28:24 2019 +0100 @@ -16,18 +16,15 @@ }, "svcore": { "vcs": "hg", - "service": "soundsoftware", - "branch": "by-id" + "service": "soundsoftware" }, "svgui": { "vcs": "hg", - "service": "soundsoftware", - "branch": "by-id" + "service": "soundsoftware" }, "svapp": { "vcs": "hg", - "service": "soundsoftware", - "branch": "by-id" + "service": "soundsoftware" }, "checker": { "vcs": "hg",