@@ -738,19 +738,22 @@ void ModuleWidget::pasteClipboardAction() { | |||||
json_object_del(moduleJ, "leftModuleId"); | json_object_del(moduleJ, "leftModuleId"); | ||||
json_object_del(moduleJ, "rightModuleId"); | json_object_del(moduleJ, "rightModuleId"); | ||||
// history::ModuleChange | |||||
history::ModuleChange* h = new history::ModuleChange; | |||||
h->name = "paste module preset"; | |||||
h->moduleId = module->id; | |||||
h->oldModuleJ = toJson(); | |||||
json_t* oldModuleJ = toJson(); | |||||
try { | try { | ||||
fromJson(moduleJ); | fromJson(moduleJ); | ||||
} | } | ||||
catch (Exception& e) { | catch (Exception& e) { | ||||
WARN("%s", e.what()); | WARN("%s", e.what()); | ||||
json_decref(oldModuleJ); | |||||
return; | |||||
} | } | ||||
// history::ModuleChange | |||||
history::ModuleChange* h = new history::ModuleChange; | |||||
h->name = "paste module preset"; | |||||
h->moduleId = module->id; | |||||
h->oldModuleJ = oldModuleJ; | |||||
h->newModuleJ = toJson(); | h->newModuleJ = toJson(); | ||||
APP->history->push(h); | APP->history->push(h); | ||||
} | } | ||||
@@ -318,23 +318,24 @@ void RackWidget::pastePresetClipboardAction() { | |||||
json_object_del(moduleJ, "leftModuleId"); | json_object_del(moduleJ, "leftModuleId"); | ||||
json_object_del(moduleJ, "rightModuleId"); | json_object_del(moduleJ, "rightModuleId"); | ||||
ModuleWidget* mw; | |||||
try { | try { | ||||
ModuleWidget* mw = moduleWidgetFromJson(moduleJ); | |||||
assert(mw); | |||||
assert(mw->module); | |||||
APP->engine->addModule(mw->module); | |||||
addModuleAtMouse(mw); | |||||
// history::ModuleAdd | |||||
history::ModuleAdd* h = new history::ModuleAdd; | |||||
h->setModule(mw); | |||||
APP->history->push(h); | |||||
mw = moduleWidgetFromJson(moduleJ); | |||||
} | } | ||||
catch (Exception& e) { | catch (Exception& e) { | ||||
WARN("%s", e.what()); | WARN("%s", e.what()); | ||||
return; | return; | ||||
} | } | ||||
assert(mw); | |||||
assert(mw->module); | |||||
APP->engine->addModule(mw->module); | |||||
addModuleAtMouse(mw); | |||||
// history::ModuleAdd | |||||
history::ModuleAdd* h = new history::ModuleAdd; | |||||
h->setModule(mw); | |||||
APP->history->push(h); | |||||
} | } | ||||
static void RackWidget_updateExpanders(RackWidget* that) { | static void RackWidget_updateExpanders(RackWidget* that) { | ||||