Merge pull request #31 from rerdavies/rerdavies/issue24

Handle missing plugins.
This commit is contained in:
Robin Davies
2022-03-11 13:04:53 -05:00
committed by GitHub
3 changed files with 7 additions and 5 deletions
+3 -2
View File
@@ -1297,8 +1297,9 @@ class PiPedalModelImpl implements PiPedalModel {
return nullCast(this.webSocket) return nullCast(this.webSocket)
.request<number>("saveCurrentPresetAs", request) .request<number>("saveCurrentPresetAs", request)
.then((data) => { .then((newPresetId) => {
return data; this.loadPreset(newPresetId);
return newPresetId;
}); });
} }
saveCurrentPluginPresetAs(pluginInstanceId: number, newName: string): Promise<number> { saveCurrentPluginPresetAs(pluginInstanceId: number, newName: string): Promise<number> {
+1 -1
View File
@@ -151,7 +151,7 @@ const PresetSelector =
return this.model.saveCurrentPresetAs(newName); return this.model.saveCurrentPresetAs(newName);
}) })
.then((newInstanceId) => { .then((newInstanceId) => {
// s'fine. dealt with by updates, but we do need error handling.
}) })
.catch((error) => { .catch((error) => {
this.showError(error); this.showError(error);
+3 -2
View File
@@ -495,8 +495,9 @@ int64_t PiPedalModel::SaveCurrentPresetAs(int64_t clientId, const std::string &n
{ {
std::lock_guard<std::recursive_mutex> guard{mutex}; std::lock_guard<std::recursive_mutex> guard{mutex};
int64_t result = storage.saveCurrentPresetAs(this->pedalBoard, name, saveAfterInstanceId); auto pedalboard = this->pedalBoard;
this->hasPresetChanged = false; pedalboard.name(name);
int64_t result = storage.saveCurrentPresetAs(pedalboard, name, saveAfterInstanceId);
FirePresetsChanged(clientId); FirePresetsChanged(clientId);
return result; return result;
} }