From b1d3756f89050fd9c3be27e9b5edc8fc9909cfbf Mon Sep 17 00:00:00 2001 From: Christof Ruch Date: Tue, 13 Jul 2021 18:26:49 +0200 Subject: [PATCH] Fix the bulk export problem with trying to export old databases needing migration first. --- MidiKraft-database | 2 +- The-Orm/MainComponent.cpp | 4 ++-- The-Orm/PatchView.cpp | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MidiKraft-database b/MidiKraft-database index d4906831..aace83b7 160000 --- a/MidiKraft-database +++ b/MidiKraft-database @@ -1 +1 @@ -Subproject commit d49068318f6fd7cf4bfa1a586d8d664a80585bcc +Subproject commit aace83b73b3703bdca453ee65c3a88b47b4d19a9 diff --git a/The-Orm/MainComponent.cpp b/The-Orm/MainComponent.cpp index 6e098221..836865b1 100644 --- a/The-Orm/MainComponent.cpp +++ b/The-Orm/MainComponent.cpp @@ -584,12 +584,12 @@ class MergeAndExport : public ThreadWithProgressWindow { allPatches = mergeSource.getPatches(filter, 0, -1); } catch (midikraft::PatchDatabaseException& e) { - SimpleLogger::instance()->postMessage("Error opening database file " + file.getFullPathName() + ":" + e.what()); + SimpleLogger::instance()->postMessage("Fatal error opening database file " + file.getFullPathName() + ":" + e.what()); } tempfile.deleteFile(); } catch (midikraft::PatchDatabaseException& e) { - SimpleLogger::instance()->postMessage("Error opening database file " + file.getFullPathName() + ":" + e.what()); + SimpleLogger::instance()->postMessage("Fatal error opening database file " + file.getFullPathName() + ":" + e.what()); } // We have all patches in memory - write them into a pip file diff --git a/The-Orm/PatchView.cpp b/The-Orm/PatchView.cpp index cb1dbf05..05fbdc4b 100644 --- a/The-Orm/PatchView.cpp +++ b/The-Orm/PatchView.cpp @@ -491,6 +491,8 @@ void PatchView::bulkImportPIP(File directory) { BulkImportPIP bulk(directory, database_, automaticCategories_); bulk.runThread(); + + retrieveFirstPageFromDatabase(); } void PatchView::exportPatches()